diff --git a/etc/taskcluster/docker/base.dockerfile b/etc/taskcluster/docker/base.dockerfile
index d3d940ce7f9..c4ce6839952 100644
--- a/etc/taskcluster/docker/base.dockerfile
+++ b/etc/taskcluster/docker/base.dockerfile
@@ -17,6 +17,7 @@ RUN \
         # Running mach
         python \
         python-pip \
+        python-dev \
         #
         # Installing rustup and sccache (build dockerfile) or fetching build artifacts (run tasks)
         curl && \
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index a6a84127237..d183025c7a9 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -265299,6 +265299,9 @@
    "docs/running-tests/custom-runner.md": [
     []
    ],
+   "docs/running-tests/from-ci.md": [
+    []
+   ],
    "docs/running-tests/from-local-system.md": [
     []
    ],
@@ -276438,6 +276441,12 @@
    "mediacapture-streams/META.yml": [
     []
    ],
+   "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html.headers": [
+    []
+   ],
+   "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html.headers": [
+    []
+   ],
    "mediasession/META.yml": [
     []
    ],
@@ -276573,18 +276582,9 @@
    "mixed-content/generic/test-case.sub.js": [
     []
    ],
-   "mixed-content/generic/tools/__init__.py": [
-    []
-   ],
-   "mixed-content/generic/tools/clean.py": [
-    []
-   ],
    "mixed-content/generic/tools/generate.py": [
     []
    ],
-   "mixed-content/generic/tools/regenerate": [
-    []
-   ],
    "mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers": [
     []
    ],
@@ -278055,6 +278055,18 @@
    "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.headers": [
+    []
+   ],
    "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
@@ -278253,6 +278265,18 @@
    "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
+   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html.headers": [
+    []
+   ],
    "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
@@ -278451,6 +278475,18 @@
    "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers": [
+    []
+   ],
    "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
@@ -278649,6 +278685,18 @@
    "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
+   "referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html.headers": [
+    []
+   ],
    "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
@@ -278847,6 +278895,15 @@
    "referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
+   "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
    "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
@@ -279015,6 +279072,18 @@
    "referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers": [
+    []
+   ],
    "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
@@ -279213,6 +279282,18 @@
    "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
+   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html.headers": [
+    []
+   ],
    "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
@@ -279411,6 +279492,18 @@
    "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html.headers": [
+    []
+   ],
    "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
@@ -279633,117 +279726,15 @@
    "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": [
     []
    ],
@@ -280056,6 +280047,9 @@
    "resources/chromium/sensor_provider.mojom.js": [
     []
    ],
+   "resources/chromium/sms_mock.js": [
+    []
+   ],
    "resources/chromium/string16.mojom.js": [
     []
    ],
@@ -282408,10 +282402,10 @@
    "sms/README.md": [
     []
    ],
-   "sms/resources/iframe.html": [
+   "sms/resources/helper.js": [
     []
    ],
-   "sms/sms_provider.js": [
+   "sms/resources/iframe.html": [
     []
    ],
    "sms/sms_receiver.idl": [
@@ -286698,6 +286692,9 @@
    "tools/third_party/six/test_six.py": [
     []
    ],
+   "tools/third_party/tooltool/tooltool.py": [
+    []
+   ],
    "tools/third_party/webencodings/PKG-INFO": [
     []
    ],
@@ -286767,6 +286764,9 @@
    "tools/wpt/__init__.py": [
     []
    ],
+   "tools/wpt/android.py": [
+    []
+   ],
    "tools/wpt/browser.py": [
     []
    ],
@@ -286779,6 +286779,9 @@
    "tools/wpt/install.py": [
     []
    ],
+   "tools/wpt/mach-emulator.manifest": [
+    []
+   ],
    "tools/wpt/markdown.py": [
     []
    ],
@@ -287592,6 +287595,12 @@
    "trusted-types/META.yml": [
     []
    ],
+   "trusted-types/default-policy-report-only.tentative.html.headers": [
+    []
+   ],
+   "trusted-types/default-policy.tentative.html.headers": [
+    []
+   ],
    "trusted-types/support/WorkerGlobalScope-importScripts.https.js": [
     []
    ],
@@ -321212,6 +321221,12 @@
      {}
     ]
    ],
+   "css/css-position/position-fixed-at-bottom-right-on-viewport.html": [
+    [
+     "css/css-position/position-fixed-at-bottom-right-on-viewport.html",
+     {}
+    ]
+   ],
    "css/css-position/position-sticky-bottom.html": [
     [
      "css/css-position/position-sticky-bottom.html",
@@ -349562,6 +349577,14 @@
      {}
     ]
    ],
+   "fetch/sec-metadata/appcache.tentative.https.sub.html": [
+    [
+     "fetch/sec-metadata/appcache.tentative.https.sub.html",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
    "fetch/sec-metadata/embed.tentative.https.sub.html": [
     [
      "fetch/sec-metadata/embed.tentative.https.sub.html",
@@ -368002,6 +368025,18 @@
      {}
     ]
    ],
+   "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html": [
+    [
+     "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html",
+     {}
+    ]
+   ],
+   "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html": [
+    [
+     "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html",
+     {}
+    ]
+   ],
    "mediacapture-streams/MediaDevices-enumerateDevices.https.html": [
     [
      "mediacapture-streams/MediaDevices-enumerateDevices.https.html",
@@ -383977,6 +384012,1884 @@
      {}
     ]
    ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html",
@@ -384613,6 +386526,1230 @@
      {}
     ]
    ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html",
@@ -385009,6 +388146,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html",
@@ -385405,6 +388566,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html",
@@ -385801,6 +388986,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html",
@@ -386197,6 +389406,24 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html",
@@ -386533,6 +389760,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html",
@@ -386929,6 +390180,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html",
@@ -387325,6 +390600,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html",
@@ -387721,6 +391020,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html",
@@ -388117,6 +391440,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html",
@@ -388261,6 +391608,78 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html",
@@ -388441,6 +391860,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html",
@@ -388585,6 +392028,78 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html",
@@ -388765,6 +392280,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html",
@@ -388909,6 +392448,78 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html",
@@ -389089,6 +392700,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html",
@@ -389233,6 +392868,78 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html",
@@ -389413,6 +393120,24 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html",
@@ -389533,6 +393258,66 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html",
@@ -389689,6 +393474,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html",
@@ -389833,6 +393642,78 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html",
@@ -390013,6 +393894,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html",
@@ -390157,6 +394062,78 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html",
@@ -390337,6 +394314,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html",
@@ -390481,6 +394482,78 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html",
@@ -390661,6 +394734,30 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html",
@@ -390805,6 +394902,78 @@
      {}
     ]
    ],
+   "referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html": [
+    [
+     "referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html": [
     [
      "referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html",
@@ -391111,2940 +395280,6 @@
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-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/no-referrer-when-downgrade/attr-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/img-tag/keep-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/no-referrer-when-downgrade/attr-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/img-tag/swap-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/no-referrer-when-downgrade/attr-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/script-tag/keep-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/no-referrer-when-downgrade/attr-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/script-tag/swap-origin-redirect/insecure-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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-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/no-referrer-when-downgrade/attr-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/keep-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/no-referrer-when-downgrade/attr-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/iframe-tag/swap-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/no-referrer-when-downgrade/attr-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/keep-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/no-referrer-when-downgrade/attr-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/img-tag/swap-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/no-referrer-when-downgrade/attr-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/keep-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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-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/no-referrer-when-downgrade/attr-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/a-tag/no-redirect/insecure-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/no-referrer-when-downgrade/attr-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/iframe-tag/keep-origin-redirect/insecure-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-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/no-referrer-when-downgrade/attr-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-http/img-tag/keep-origin-redirect/insecure-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-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/no-referrer-when-downgrade/attr-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-http/img-tag/swap-origin-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/no-referrer-when-downgrade/attr-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-http/script-tag/no-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/no-referrer-when-downgrade/attr-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-http/script-tag/swap-origin-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-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/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/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/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-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/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/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/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-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/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-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/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-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/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-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/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-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/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-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/no-referrer-when-downgrade/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-https/img-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/no-referrer-when-downgrade/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/img-tag/swap-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/no-referrer/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/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-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/no-referrer/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/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/no-referrer/attr-referrer/cross-origin/http-http/img-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/no-referrer/attr-referrer/cross-origin/http-http/img-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/no-referrer/attr-referrer/cross-origin/http-http/script-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/no-referrer/attr-referrer/cross-origin/http-http/script-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/no-referrer/attr-referrer/cross-origin/http-http/script-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/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/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/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-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/no-referrer/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/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/no-referrer/attr-referrer/cross-origin/http-https/img-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/no-referrer/attr-referrer/cross-origin/http-https/img-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/no-referrer/attr-referrer/cross-origin/http-https/script-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/no-referrer/attr-referrer/cross-origin/http-https/script-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/no-referrer/attr-referrer/cross-origin/http-https/script-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/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/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/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-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/no-referrer/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/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/no-referrer/attr-referrer/same-origin/http-http/img-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/no-referrer/attr-referrer/same-origin/http-http/img-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/no-referrer/attr-referrer/same-origin/http-http/script-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/no-referrer/attr-referrer/same-origin/http-http/script-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/no-referrer/attr-referrer/same-origin/http-http/script-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/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/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/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-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/no-referrer/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/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/no-referrer/attr-referrer/same-origin/http-https/img-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/no-referrer/attr-referrer/same-origin/http-https/img-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/no-referrer/attr-referrer/same-origin/http-https/script-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/no-referrer/attr-referrer/same-origin/http-https/script-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/no-referrer/attr-referrer/same-origin/http-https/script-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/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-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/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/http-rp/same-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/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/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/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-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/no-referrer/meta-referrer/cross-origin/http-https/a-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/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-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/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/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/no-referrer/meta-referrer/cross-origin/http-https/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/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-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/no-referrer/meta-referrer/same-origin/http-http/img-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/no-referrer/meta-referrer/same-origin/http-http/img-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/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/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/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-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/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-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/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.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/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-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/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-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/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.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/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.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/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-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/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-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/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-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/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-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/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-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/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-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/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-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/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-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/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.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/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.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/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.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/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.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/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.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/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.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/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.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/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/a-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/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-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/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/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/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-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/origin/attr-referrer/same-origin/http-https/iframe-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/origin/attr-referrer/same-origin/http-https/iframe-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/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/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/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/origin/attr-referrer/same-origin/http-https/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/origin/attr-referrer/same-origin/http-https/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/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/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/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/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/origin/meta-referrer/cross-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/origin/meta-referrer/cross-origin/http-https/img-tag/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/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/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/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/a-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/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-    [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/img-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/origin/meta-referrer/same-origin/http-https/img-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/origin/meta-referrer/same-origin/http-https/img-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/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-    [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.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/strict-origin-when-cross-origin/attr-referrer/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/strict-origin-when-cross-origin/attr-referrer/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/iframe-tag/no-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/strict-origin-when-cross-origin/attr-referrer/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/iframe-tag/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/strict-origin-when-cross-origin/attr-referrer/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/img-tag/no-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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.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/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/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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-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/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.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/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-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/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.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/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-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/strict-origin-when-cross-origin/meta-referrer/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/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/strict-origin-when-cross-origin/meta-referrer/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/strict-origin-when-cross-origin/meta-referrer/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/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-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/strict-origin/attr-referrer/cross-origin/http-http/script-tag/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/strict-origin/attr-referrer/cross-origin/http-http/script-tag/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/strict-origin/attr-referrer/cross-origin/http-http/script-tag/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/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-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/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-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/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-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/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-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/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-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/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-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/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-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/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-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/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-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/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-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/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-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/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-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/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-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/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-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/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-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/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-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/strict-origin/meta-referrer/cross-origin/http-http/img-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/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-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/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-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/strict-origin/meta-referrer/cross-origin/http-https/img-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/strict-origin/meta-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/swap-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/strict-origin/meta-referrer/same-origin/http-http/a-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/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-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/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-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/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-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/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/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/keep-origin-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/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/img-tag/no-redirect/upgrade-protocol.http.html": [
-    [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-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/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
-     {}
-    ]
-   ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-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/unsafe-url/attr-referrer/cross-origin/http-http/iframe-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/unsafe-url/attr-referrer/cross-origin/http-http/iframe-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/unsafe-url/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/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/unsafe-url/attr-referrer/cross-origin/http-http/img-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/unsafe-url/attr-referrer/cross-origin/http-http/img-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/unsafe-url/attr-referrer/cross-origin/http-http/img-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/unsafe-url/attr-referrer/cross-origin/http-http/script-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/unsafe-url/attr-referrer/cross-origin/http-http/script-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/unsafe-url/attr-referrer/cross-origin/http-http/script-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/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/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/unsafe-url/attr-referrer/same-origin/http-http/img-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/unsafe-url/attr-referrer/same-origin/http-http/img-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/unsafe-url/attr-referrer/same-origin/http-http/script-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/unsafe-url/attr-referrer/same-origin/http-http/script-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/unsafe-url/attr-referrer/same-origin/http-http/script-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/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",
-     {}
-    ]
-   ],
    "remote-playback/cancel-watch-availability.html": [
     [
      "remote-playback/cancel-watch-availability.html",
@@ -396244,7 +397479,9 @@
    "service-workers/service-worker/fetch-event-within-sw.https.html": [
     [
      "service-workers/service-worker/fetch-event-within-sw.https.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "service-workers/service-worker/fetch-event.https.html": [
@@ -398324,9 +399561,9 @@
      {}
     ]
    ],
-   "sms/sms-top-level-frame-only.https.html": [
+   "sms/sms-iframe.https.html": [
     [
-     "sms/sms-top-level-frame-only.https.html",
+     "sms/sms-iframe.https.html",
      {}
     ]
    ],
@@ -404204,6 +405441,12 @@
      {}
     ]
    ],
+   "svg/animations/beginevents-1.html": [
+    [
+     "svg/animations/beginevents-1.html",
+     {}
+    ]
+   ],
    "svg/animations/change-css-property-while-animating-fill-freeze.html": [
     [
      "svg/animations/change-css-property-while-animating-fill-freeze.html",
@@ -406396,6 +407639,18 @@
      {}
     ]
    ],
+   "trusted-types/default-policy-report-only.tentative.html": [
+    [
+     "trusted-types/default-policy-report-only.tentative.html",
+     {}
+    ]
+   ],
+   "trusted-types/default-policy.tentative.html": [
+    [
+     "trusted-types/default-policy.tentative.html",
+     {}
+    ]
+   ],
    "trusted-types/eval-with-permissive-csp.tentative.html": [
     [
      "trusted-types/eval-with-permissive-csp.tentative.html",
@@ -421842,20 +423097,9 @@
      }
     ]
    ],
-   "xhr/abort-after-stop.any.js": [
+   "xhr/abort-after-stop.window.js": [
     [
-     "xhr/abort-after-stop.any.html",
-     {
-      "script_metadata": [
-       [
-        "title",
-        "XMLHttpRequest: abort event should fire when stop() method is used"
-       ]
-      ]
-     }
-    ],
-    [
-     "xhr/abort-after-stop.any.worker.html",
+     "xhr/abort-after-stop.window.html",
      {
       "script_metadata": [
        [
@@ -445326,7 +446570,7 @@
  },
  "paths": {
   ".azure-pipelines.yml": [
-   "06fe7999246ee7af31d11d266ff6c51f17c1fe12",
+   "58e8d6ee1dd9520008ccd43649242157994c94e8",
    "support"
   ],
   ".codecov.yml": [
@@ -445362,7 +446606,7 @@
    "support"
   ],
   ".taskcluster.yml": [
-   "1a162ed740285cc0e7c99943f7988686bab89b5b",
+   "0b7b50b35d4d616f89474f9236a2da87bf21705a",
    "support"
   ],
   ".well-known/README.md": [
@@ -449354,7 +450598,7 @@
    "support"
   ],
   "2dcontext/tools/current-work-canvas.xhtml": [
-   "1baf354028c45fd0ee0f35bfd8ee02198ca9fece",
+   "2bb889ab275fcdc7983752fa79e8dc990b38c5d2",
    "support"
   ],
   "2dcontext/tools/gentest.py": [
@@ -472526,7 +473770,7 @@
    "support"
   ],
   "conformance-checkers/html/elements/style/html-spec-comms-isvalid.html": [
-   "69f70d5d6676bab0eead2a4dddd69d206d020a2b",
+   "2124406a31999d5089978329fc13672f8b3587fe",
    "support"
   ],
   "conformance-checkers/html/elements/style/model-isvalid.html": [
@@ -472578,7 +473822,7 @@
    "support"
   ],
   "conformance-checkers/html/elements/table/integrity/Alexis_of_Russia-novalid.html": [
-   "f56e459f2958c572c363d714010a10fd6a60fa88",
+   "687213c3b948ff09e97f79f92ec2fb12d7ce6d39",
    "support"
   ],
   "conformance-checkers/html/elements/table/integrity/Feodor_I_of_Russia-novalid.html": [
@@ -472586,7 +473830,7 @@
    "support"
   ],
   "conformance-checkers/html/elements/table/integrity/Naser_al-Din_Shah_Qajar-novalid.html": [
-   "a1588dc1837e6abe772cc6dfa13ef3b5ea055310",
+   "1277d757caee109282fa6f936688e284a431edab",
    "support"
   ],
   "conformance-checkers/html/elements/table/integrity/vertical-novalid.html": [
@@ -552950,7 +554194,7 @@
    "reftest"
   ],
   "css/css-flexbox/percentage-heights-003.html": [
-   "37109e2e78064e1588cb4252b8b2f8b154d43e6c",
+   "9d434cf7cb8ba2023c126391032985d3d3b7c5d9",
    "testharness"
   ],
   "css/css-flexbox/percentage-heights-004-ref.html": [
@@ -567842,7 +569086,7 @@
    "support"
   ],
   "css/css-multicol/multicol-nested-column-rule-001.xht": [
-   "9287f2679ec30393b998f27d7d227c4f82362f82",
+   "8fa8fdb7280083b538ce20b451f20d1c711335e5",
    "reftest"
   ],
   "css/css-multicol/multicol-nested-margin-001-ref.xht": [
@@ -570697,6 +571941,10 @@
    "644b147a227e100c500de2de9e4f8e8449a4a21e",
    "testharness"
   ],
+  "css/css-position/position-fixed-at-bottom-right-on-viewport.html": [
+   "9184db028e864915813a4dcf76822f9a07d03b29",
+   "testharness"
+  ],
   "css/css-position/position-relative-table-left-ref.html": [
    "7c1193b80007d8e7f89b35400a6d2ea2266cb3ac",
    "support"
@@ -618813,6 +620061,10 @@
    "4e860edbb21193a82d7333541eb55ada124c82f1",
    "support"
   ],
+  "docs/running-tests/from-ci.md": [
+   "9ea142bb4ba4a5b6f4bb7f0da7c4d29cf932486b",
+   "support"
+  ],
   "docs/running-tests/from-local-system.md": [
    "35c1905a0c5690171489e93e1635c793433c402a",
    "support"
@@ -618822,7 +620074,7 @@
    "support"
   ],
   "docs/running-tests/index.md": [
-   "7e8a9913132b074556907875f49aa2a9e81905f2",
+   "17b361dde8f93880d9f8951b48020e521f55ecd6",
    "support"
   ],
   "docs/running-tests/safari.md": [
@@ -624810,19 +626062,19 @@
    "support"
   ],
   "feature-policy/reporting/xr-report-only.https.html": [
-   "bdef39cde8c65cc1e491b76b449c19ab7cd0ed87",
+   "d999c977dbe361cf8b3fbf520fb8bb3fe9f3bc4f",
    "testharness"
   ],
   "feature-policy/reporting/xr-report-only.https.html.headers": [
-   "0761021f45e141f35ce104e5cefe81f9704ccb7a",
+   "47b7c824b355f13ddea3eb0bb5825e4fb69c8beb",
    "support"
   ],
   "feature-policy/reporting/xr-reporting.https.html": [
-   "3ce61cd13ac5103879a327b62fb70e35e9de0f06",
+   "68a3e4e737b85959a54895491682b08368c9fe5d",
    "testharness"
   ],
   "feature-policy/reporting/xr-reporting.https.html.headers": [
-   "d021af75636de273c868412cd98dfff50576151d",
+   "ea8722131ce0d9ca4a05390500d03b8f94394401",
    "support"
   ],
   "feature-policy/resources/autoplay.js": [
@@ -626257,6 +627509,10 @@
    "c460aa1ecb941118b6999209ba4601eb145a61b9",
    "support"
   ],
+  "fetch/sec-metadata/appcache.tentative.https.sub.html": [
+   "5d583380ea182000e7e7a5bea8f5fe29d1a2f03f",
+   "testharness"
+  ],
   "fetch/sec-metadata/embed.tentative.https.sub.html": [
    "c46765b37c6325260882751e9e592c2b55d8b128",
    "testharness"
@@ -649042,7 +650298,7 @@
    "support"
   ],
   "interfaces/payment-request.idl": [
-   "fefdc6f361774180c6672b6407e6cfa63dd3669d",
+   "e41cae2f06d0d479f68066d786c7371e7d4da934",
    "support"
   ],
   "interfaces/performance-timeline.idl": [
@@ -649194,7 +650450,7 @@
    "support"
   ],
   "interfaces/web-nfc.idl": [
-   "8c77339ae865fbe2a67dd6c1247c797a5bab058d",
+   "b08bc7d4069747ed785dd62db23bb94fc269153b",
    "support"
   ],
   "interfaces/web-share.idl": [
@@ -649246,7 +650502,7 @@
    "support"
   ],
   "interfaces/webxr.idl": [
-   "413fef85c8708aac6d66914a4c846ba48add492a",
+   "809f3e4b6adc03dfed753eedb3517fa639cc9e34",
    "support"
   ],
   "interfaces/worklets.idl": [
@@ -649906,7 +651162,7 @@
    "testharness"
   ],
   "lint.whitelist": [
-   "8ff3b81893231ad409e4dd41378a7826a848afb0",
+   "17ccf19f80a8bd25e9729902e3223074f1d03b42",
    "support"
   ],
   "loading/lazyload/common.js": [
@@ -652073,8 +653329,24 @@
    "e6e8587cdd11f6da78c3a1605dc13ddd5e80f803",
    "testharness"
   ],
+  "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html": [
+   "1bb086dadddd6a2282daa06fccecbe0d10214efc",
+   "testharness"
+  ],
+  "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html.headers": [
+   "2adc5e237fcec874767ff8f5ab38e3456c02cbf0",
+   "support"
+  ],
+  "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html": [
+   "8d535ce551de2594ec2214daedc462589897de75",
+   "testharness"
+  ],
+  "mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html.headers": [
+   "a86e0a077851a84f704e2aa4df1d526ecd9a55b2",
+   "support"
+  ],
   "mediacapture-streams/MediaDevices-enumerateDevices.https.html": [
-   "76ca435cf588881ba90a73663fd0708fb9e27dd2",
+   "efb460731690df01e3b53d15eb4d097f2d16b106",
    "testharness"
   ],
   "mediacapture-streams/MediaDevices-getSupportedConstraints.https.html": [
@@ -652697,22 +653969,10 @@
    "d25986e5c26745976e13d2d683c3bece3ac2ccc0",
    "support"
   ],
-  "mixed-content/generic/tools/__init__.py": [
-   "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-   "support"
-  ],
-  "mixed-content/generic/tools/clean.py": [
-   "15f294b5c8c878cb6ecb854aa9e5385b64b6d1a1",
-   "support"
-  ],
   "mixed-content/generic/tools/generate.py": [
    "b80bc8df6bbebe969b88fd48d52abc7819ac9a3c",
    "support"
   ],
-  "mixed-content/generic/tools/regenerate": [
-   "e6bd63519b331b3a921755445f6895e39f7864f5",
-   "support"
-  ],
   "mixed-content/imageset.https.sub.html": [
    "1f3d0471fbd2b38649894619494750ef221d72c9",
    "testharness"
@@ -664357,6 +665617,1258 @@
    "93b6037ca632a678f8c3f1e071392e8e3bf1540c",
    "testharness"
   ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
+   "4825a8279448ad38cf00f49ecb80960df16974af",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html": [
+   "647787e61ab30560983f4a83be0f27ea08d557f5",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html": [
+   "decf80de2e9b726877d85c907116fbc7a504d108",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html": [
+   "b6a5a5de6ee261ec98ed2e969142e262af7a276e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html": [
+   "1a27c3a0869facc0fd2a58c3bfa8ca83a5799f10",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html": [
+   "aa0039c79427f1c5272c8b67ebd3be7fb140ddf3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html": [
+   "6b07b76078fcc8821522dd47ff1aad3d7da5b9c3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html": [
+   "7e8eb2f52646645348dcc52f0ef7d3939fe1ca0c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html": [
+   "808591bba78f2248e5b05f0b1a8a775acaeea70e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html": [
+   "c34d02b350b62e84868fb6983afd4a0c44ea8915",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html": [
+   "c27bc9cbe1d39529dd776fdfca5c423285333b93",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html": [
+   "31215abda87f061027df71f8fb735be8a3a14bc3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html": [
+   "ed8626df8c700cfe787a7b34b769f2cddff4aabe",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html": [
+   "692b4c53e7fe333cdeec1722729d43eafb138d4e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html": [
+   "9c7ab68b3af8a8d19c74733034b4b582153bfe75",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html": [
+   "245b73515188d167f7b20db1bcd816c29cc73b44",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+   "d74dd271bd264ce497e362358bbb9dbdcd5a9f5e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+   "d48ed4ea2bf33f87cb306d49ffd47e2cadfd2536",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+   "ad81b76b7859dfc7a1d792b12cdb59a651f321d8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+   "08991299f889363371ed4579d2712f18b9fc247b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+   "9823e5725673be4a0115a07b95f7eba355d0c1bd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+   "2a70a7b876eac34fb8e6325a5c3fdc2d3c4bea3a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+   "9d16178c144cd22f6611a177b00bb561163ef526",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+   "00e09a77d1308252e98e71ccb1e259f36a9185e2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+   "20bade73d065f18acda955a76e57212e2f96b402",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+   "b901bb357563f8419d5733e31460ae576a84c9c3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+   "11606941512f83556eeb92d99d60bf4c2ab53888",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+   "0b78a17424c6fbe8a8beb7846be3fdc7ee0d63a0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
+   "72e0986a09e6119c927142236e4088ce97c8dd83",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html": [
+   "e7b0bfc2c89870ed36cda4ded3ae509e9dc75196",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html": [
+   "09b05d5fe6eaf9d531f0938a4b473a37a36dd096",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html": [
+   "68e5a86b43544d9766ddea6e43aafdaf18b6d7b8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html": [
+   "2c0ddc8ae6b5d30c2608d1b8909439cfa320badd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html": [
+   "66a603db60558abecedcec841612e28ee18fe8ba",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html": [
+   "c54bb84a6f8e9345e5fd33a5f3125a304d9bf045",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html": [
+   "fdcceccd942b2d0d1fd1fecc74d774dad8fcb62a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html": [
+   "5614f7694d37865aef5b873cfea1a3ce96b37f4f",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html": [
+   "49d1b82be5fe0926469cfa2f89c885f7bde19020",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html": [
+   "1290a24677af9d55598290b9c3164959f5881385",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html": [
+   "4776ae42efb35abad3b92942c6e87af0e930d6dc",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html": [
+   "0916a69fb5277c015a78d64b67f89e2f486100af",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html": [
+   "21169cace6552bc53b25e9e4d9f2df987ede9210",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html": [
+   "8b9af5088424a89f084cebd4bb70f8f0dfb78ba2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html": [
+   "ea6929b55bd7205e7086bfabe88468d979ca08c9",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html": [
+   "f17babd6b743a2a2313360ba6c657affe4c23bb2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html": [
+   "27f2a91c25ef3bd22c291d9af1d21b46c0959e8a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html": [
+   "f8de0159aa0cbd374a706795ff0bd1911238b8db",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html": [
+   "2fac3de9cd139e2a34962e6259e66bae65f1aaf8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html": [
+   "827db9aab6b162ed3ae2b684cd377b99ce307607",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html": [
+   "a154c88d555387d6c319369a2fbe91cd5c2eaaf6",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html": [
+   "2f3fc57ea106ff20e22ebd1cdf8907f62dbb8493",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html": [
+   "886fb1c0620db2a568e2ba7b9ddf083dfd85df6d",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html": [
+   "f2cff2549cbc395488547e5a9ee9b25044e93cca",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html": [
+   "a4bb33091ff95d13134c7a26094008535a755d7c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html": [
+   "a531d13b73965ff95efcc91e7986b1cf4501f8f7",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html": [
+   "8f05dc73f1f714ad3030a221478cc9331cfd7452",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+   "6358c82b79bdd1268910c2c5ff4b08f11c0d0ad0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+   "1fb24101820625566b5b2f04fee277e5e413ebe2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+   "79ac1fd5e86c372f94834218881075856b3b1cbc",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+   "259311f3b4e14e8333503c6e11a65c887451c5c8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+   "dcd8eae0ea30b07502534300de0e20b37a54aaf9",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+   "4473d6d90493571645b192783be11823eda6e438",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html": [
+   "8eb9b89a500937adfb5949b439b211f6f1c98c74",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html": [
+   "bced80f139ad919f838ae0a676866c5034c0c3d9",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html": [
+   "1dc8cd37db2dbe5d9d17d459f66af00fa3664ed3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html": [
+   "d1709213c34e3e46ab609bdad91812aeb54ae07b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html": [
+   "50541ed18281b6c4481717160c43eb2e9ae6a266",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html": [
+   "aae8174b856696ded8b09a0abd061ac49d86c4bd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html": [
+   "5a4e2658218e939a4c5338ba8d646a7587094b7c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html": [
+   "9389cdd10a2e96c7b73e5c45fc77730cd9dee2ee",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html": [
+   "4166472aa129b352b6b5a73a89556046a76bfbd7",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html": [
+   "ee4cd8d1df683c4168350975ed1e05f3ee0745d0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html": [
+   "fdb452ec73cb6e53e41c411b3289e871dd0391f5",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html": [
+   "66a65789f04574b8bb7823107796969888e6db27",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html": [
+   "22b0a5c401119b2cc8ce4c5d05d469182dc3fd2b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html": [
+   "a3c33c35151f6971697d700790c91e6007302143",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html": [
+   "f17d8809515a5a0ccab924b9d23786b313704a2c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html": [
+   "0dd372af5a83c55738699f0bdf1b70fc8dae3441",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html": [
+   "8ed8c45f6bfcc2e265fb0cc3323c649ac21feacf",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html": [
+   "331ef74c332af0c18b22548701539149ba2a89df",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+   "9d80e4eecdc6d7126fb44ca9a801a80d7364af07",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+   "a43158474681a47a30263b44808b40d793e4a1ef",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+   "5ccee6e3f10131b00e98a644dc920d19df5211c2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+   "56545c05ba89e0d0de7d083a25aac2c2efa86bfb",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "ef7a45d88ea1b3067f63977b3170ca77c2a717ef",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "ee59f03f364fa778b65d387693a48d8918d84389",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "5c437e00b1d4b62e4b9d4a495853af5f071515e4",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "87e2d1934d9e2145218667bfc4685a31e1d202a9",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "cf3b6f9f246e30a52efe3e0b0602702d0d3a68c5",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "8c0ad2782c9578b0e1c23219b9431131f3703683",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "6e715b9ecdf66f22e150d63a3c8119efde1d1fe4",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "9bf71ddb2acafeef7ea18dea00c267182fdacbcc",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "0c9d06784e2250d452edbb0dbe2644132b29ca98",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
+   "407c6c2cd275b1601024d3264e2ff7814cc9fe35",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
+   "06ec85c630cc8e045efa1af771e082d9b682e896",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "cc194c3fec9c0885c3baaf09a52f40c51972ed68",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "106dedcdc8dacc2cfea5d7c43dde1ac61df1e804",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "1c3e33a4a0672228e1cd769fa99ce68d41c6c12e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "61fbf48a46c11acc653856900bc54a607ef09897",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "9dcd043bea75a8e722739beea27804b004ce370c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "c65bcef878356ba4feb8cd4f13d2e5fc6490265b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "7753e3bfc98230bf281d85005df70b24b9d3847c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "992f928945519c267c784b75a77eaf6dfba8ea9f",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "5e41bb0cc9e9e90319e801ca4c16e60145b3e93b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "7f3de2db402c3f1300fd5e1e1a9ab70d7885b517",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "70007a98bfa1638253c23d66d4b6ed527e7e333b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "be6efd6d485be7151176cdb896e08fc40c34feff",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "fbd23adf84eba7442709b4c2e7148cbffefc93c5",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
+   "aeb25636b7fd481cebe5d1c1c01349f9eac00832",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
+   "0427b033f3877ec86e1f5d656dbd2878e233dc79",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
+   "2af95f1d68a710e294a76527714005d92cfae667",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
+   "3298ff9e12984b8a6a5c861a6f0a2b4e125fd8c4",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
+   "5ece6e19585bb63e9aa8fe0eeef65782ef135edb",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
+   "d2179b0438dfb7da21b619e0d429653a7cc05bcd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
+   "a6cddc510df9c2259bcd8905f48bed0211580fbf",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
+   "734a16e4b1b849e37e79f0991df7631eabadf4dd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
+   "678f150c190c6bd98e75d3403a84a32b22767e3c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
+   "eca7111fc903d1eedaeb56a1cdeda04aa2000267",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
+   "dc2a2a0dd0c031710a94e4e12650b92075a28267",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
+   "798557359cba5ba1485221a656d8fd6fbc4b8cd3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html": [
+   "64c04a97042b072c7e2b3a346ac0f589f29dc72f",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html": [
+   "c98597dadce8f20a4166887d85645b892d818dfc",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html": [
+   "614150e785bb80c07a1dd34db3eff89e06b75ed5",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html": [
+   "737081aa79ab2458f8202f46aa648f1c4d0e5a19",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "84bf51c4d1854a26816fd3b70a961e70fec0c2a3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "9b17cbf92f2e730432c59e0179fbdad0d1c47119",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "9ec69dda44d7bc30f52982877f96dc8b69974785",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "fd44f0ca282c29d5561925a536468c4a1d7914bd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "50a4d48a8d9710ddb3b7b1376ae8ce3cfe520653",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "20f1d03a5299ea91167e757b0a625f9e30b11d00",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html": [
+   "d94085f06d72d05f09d03276ba874cc21f74f0c6",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html": [
+   "d9ccac882252fb5add3faa7279c2c9d1c5e12928",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html": [
+   "c25527091fa5dd45a512f764f5c80b77c9c85f95",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html": [
+   "f8b5fc04fd6a0a278800d05c21863a5c47774b34",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html": [
+   "d060772ff539b6a24ec94d59fb359f62a2a97e54",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html": [
+   "7f0b59b2f7fa01688e57e37a557155f5d89ee6b5",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html": [
+   "c186c75bb1546b2549ee68b5088eccabde433831",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html": [
+   "88c7b019ae7dd13ed0f2216a0ee0cf6573707f93",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html": [
+   "25181372ef77c262877cac9a7c222a9ced61c764",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html": [
+   "116b4bb7e316fcf5a46933aeceba21de5680500a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html": [
+   "2e43d922fb716b62c4b8115f926dce7e4e7f60f0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html": [
+   "d4b14f6272bdecdfd0ee76453f663501ccaa8357",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html": [
+   "2f7952592a027df54f419f542674437ec0c74ff0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html": [
+   "5c6ec1b352a088319bd6b1964e2ed3dbb6453a63",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html": [
+   "6949391f89fc46c21e6d332329c7d1c1e215aa5e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html": [
+   "1a3356ae51fbed72ed031311a335d5c279c72a52",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html": [
+   "c2f0761b0510fedf01001dfed6d425dbced922eb",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html": [
+   "e1248a840876136b645175cd9965041da60654b4",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html": [
+   "554944e44773034a7e8931e1bef6a91a7d12c6df",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html": [
+   "39e5faeb839c29267763b12c147e10818536e03f",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html": [
+   "f8041536ec75918d462a3198b8bc38b493c6ed59",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html": [
+   "3d247e1a1a5faada37684bbd635bb04d2fafded8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html": [
+   "6f72764dc1c2a06ea4425cff11d62479d0d93d4d",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html": [
+   "4c50a6390acc0aa7e389954c0f15831a63342cf7",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html": [
+   "912154843092461e6353ddc65b8baf570ea0169e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html": [
+   "9c37207b556c79e2393c2b22bb38d1967fba87aa",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html": [
+   "ef85410bc78fb37db3caae05f7f966dbf3507a6a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html": [
+   "9689f00cf8e49a232ba0e820a5cf4fe1c0e071b3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html": [
+   "4265d2545282de0ace391bff032456a5afe7aede",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html": [
+   "9e37ad97785737382a66e1b28fbb30298753b557",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html": [
+   "a624bd10eae6bb0aed944d6d9c6736d36708b294",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html": [
+   "af720c30018920ea0fd6ce38a5b98c7cc54eb0b3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html": [
+   "bce9eed482b1137ae8284c88d3740c4a074672c3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "a7b2ab3f67cfbfc387341f920fb64d9263d35b96",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "263ec260bc188b15143e0bd5f9c7d356d5c1464c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "95c93beb73213329e60ed374ea426494ed88c7cd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "a33d854bdf15de59457dcf490eb3ef201384bb9a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "63e596c15143cfe9dcfd45ab3eb6917cc737651a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "171502c50e0ab8e364e8e26ab2c53afe1349e157",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "4903ca5f6754ab2c958ef0ca2c9c6e08fcbcde08",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "502bb9c8f367d51f7138bd6289ebb6822a1731bb",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "007dad5d22d6075e9b55a5083717020817a298a1",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "fa7185a86dd69954e5f60038376a7c73c1f67b68",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html": [
+   "0045f09d8fa2f47fa6cc5ccc3634e57b87b9ad14",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html": [
+   "a8f8b3caeac9ab9e1e877a7ebf1415bdfc1908c3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html": [
+   "a43218e73b60d713117e103784416c58700cf0b8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html": [
+   "922463d4fa7ca0b111dcf09222437258b96d1247",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html": [
+   "61a04a95880405ad67a41974413f29884d911d0d",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html": [
+   "821db669012422b3eac7f65d8122f181aa1b1f63",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html": [
+   "f3a5cb72203b460309863321b99c58b239eb6073",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html": [
+   "4f22a025f9e2b02dfe574b4f9b537d6715738f62",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html": [
+   "b7e82f0bc13168c371e6ea5b5b5b33d53977b6ac",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html": [
+   "6120f05ba5fafbf3c27b2252278a575caab1d10f",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html": [
+   "4ebe79eb629d43cbd2c24b5f58cc154e7b6fbe7a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html": [
+   "ec74a0ee7d7954ad205281c69302235a3ca9d157",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html": [
+   "7cb88653f5f336c560ad7b067e398337bd03fb1e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html": [
+   "5f1663107007a34b5b2535ebf80e36b7ccd94630",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html": [
+   "c8e318f31d2baab878c8d76d50a97783e5d9e1bb",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html": [
+   "2158ee39119157f5266e78b51314598b01966913",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html": [
+   "375395fd85c14d45fc7f8d938bc01069581f801a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html": [
+   "4664e06655058a8e9d1c957ba0322057605203eb",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html": [
+   "0ff52d2743bc221df8bd298d4c942fac50da3a39",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html": [
+   "8a5db6047dcfc3fffad591441cc44009005b9ecc",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+   "6dcd37b4fc344a0d99668e44d6f40d47c01907f7",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+   "95894095f54bd95266aab2f1cd17bc4a08c1981b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+   "8eca6aafee484d0d8896b1006e1fe3c47824d299",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+   "50ca73cff70734bb02de1b97b823e3e42724d252",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "60abdb72fd920b2ce828071102aeeb6e28201ed5",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "ffa9d7df39ea8d482e6a4d9c19d0c81c58816928",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "b62cfd679c4fc87c45f96214ac360b6b62b72fa8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "44a2e79c1c29e7f05a202aad61a2a0680f86f95e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "4e406e5c69be4eecbf1d705621405453cc0135cd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "4a75656e176a20a7cc6222f7cd3a2223b15748a0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "315fd275ecae421282dcfb3168a6290fdacf9079",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "0ff3797bc5ad0ad9d95980955b5a9d54a79c74aa",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "20324578e4ea5256d12c81ef3bf07a698b46ff74",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
+   "755a98e193b3517ce3d978d60d09a2de80c750ce",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
+   "5cfe32ce99c97ec03a9487efaf28089ebde5c6a6",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "19172dab930db256821e46c76a7b4501b3c1c623",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "a3449e24234702d44e5ce7a45fb794f19c322695",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "7032a6306569752f5b2de9d9ab0bf1b35f370bcd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "d97e2d45e30c00e554a889ad203d6ac026044ca0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "30c698c9844660f022d6f4354df36b526efb99d1",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "61c321098cea33816a4b749645a5c14dd7b0aa20",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "f0966ed410f7dc22771cc06e10b4f809bee8a0db",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "01e02272561c78af7f43e579f3bc3d868714b50b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "81bbff6895f9806533915a8c5c35ea19999ebcdf",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "c6b90c2c3fbdb32cd2a45908c3c05ceb239a8979",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "07c064b1d591dfc70584f277ab050eac87d050f2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "d947eda5e16265bcf89381d9ecc8408660e36abc",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "facfbf66bb5f25a1ebfa8d05f4f27ba1323344a0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
+   "e12bf944e9be2926647067801b1297dae61c6b75",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
+   "a7ad127967f8a39b71c02178dec90cecbf3e55ce",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
+   "944ce80657af4f92d4552e08360f9f5cf275de2e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
+   "974c0a7582e8d01842180be9d340a8dd52afed5b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
+   "c0a4cfb746fa65eb9a1171048c18c0150285224b",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
+   "06e50c50c3e7a736378814bd367eed4a3f9fa1bc",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
+   "05e3b36ef792ea8be07a82cfca52a3f08104fde9",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
+   "c7b22009071cdff1d5a805c838f4559de7493211",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
+   "d1d3b72459bb128c9de3eedc35c67b169435a7c5",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
+   "8660d6beb4ffdadd54f15fea880c79781fbdcd9f",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
+   "94bda07c22e32cb200e4b883a11fb9881bd30440",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
+   "a60910158f5a0a98357190fc77ee808e83873232",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html": [
+   "b0dbaa7bc6b52dc67934ad460adeb837fc0583f1",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html": [
+   "0829171af489a1b3ed2648c63ccb8ee308205fce",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html": [
+   "278db9078118c9e0569288641bd594dbd1073027",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html": [
+   "5ce0e76a00e505819c71f51046ba4b17eff57481",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "38ac8138abbfbc44a5f67a1107909a20d035eba9",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "44ef01de4c4319128cf8c52b038e4c917c4d131a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "ebb7dd47cd9528b2e907e8f06ab9a1b77385ab6c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "1596f4315628b1c385b4c2d150ee7f88ff66cecb",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "f84e8b142972ce090025f329d63a2698dd827505",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "6dce9d9ea953a8c9e79a371661934f1ed293f62f",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "78b4970347bdca8be223f723d122c3cd599f7612",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "ce839946a54cc8bdda4c760e7889d39c7c838bd1",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "fe7607d37a8f6a4b0c2496e328fe77981c0e41f2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html": [
+   "10792aa2cef848328d009b0f0c880b1cd95a9a6d",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html": [
+   "f56167da6d5d73ffd45feaf9599ab1bbfa1c4c15",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "379db165aed957de91581c1374636787bdc0fb1d",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+   "0fcf0480ddeef83b9ab89090f86bbb96801ebaf8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+   "2d0f92a3bf4a596a3d693b735092088eac79108e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+   "bf42c7baa81ef7be4b225005203a46d9bbc0d64d",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+   "35497b2a02d6499d215dc115e1db73edca13f26a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+   "4cf4755ef6e577681484595e290842acfa2a8ebd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+   "b664f0265e2386a84a4701e487db7df1661d751e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html": [
+   "682008676e1eea1287f0d22578a3692547edcad4",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html": [
+   "07a0ea1b55e2955db3a55bff81f988d6e438aa28",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html": [
+   "41b5ce92a97e5f1de5cef7e4f021535ae728582f",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html": [
+   "5e864962d563530e6b25e1a1deaf0ca5b2896d00",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html": [
+   "98b404fedf51e31ec7a30cdccd16bac7ce644063",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html": [
+   "602691c693433e934850e30cf5b946a1243cbde8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html": [
+   "bcf46902863875313b3ff3cf8c380b5c38d975a0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html": [
+   "09b0fb764864e5fa72efc29c288f4e48f21c73ab",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html": [
+   "315750b51e37a38d2a36b3161970845c2c1fd3bf",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html": [
+   "482f2d065f7222c255689de50824193fedc85ef1",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html": [
+   "3d372423afdf263d3092323ddd0891732bb6e5d2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html": [
+   "0f2602a1be44242a59de275047fb9ed92545cfd5",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html": [
+   "067741bf3b5873c4fbf479b046309bcea00d582d",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html": [
+   "828ec64b0c984765ca7bdeaeb7f809eff442e7ae",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html": [
+   "cd27f9f08edafd84a13420fcf6d5238e75bc217c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html": [
+   "f137640e9650a0356c9efaf527618ddf9b7abbc9",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html": [
+   "6b8948def66cdd330fef8b06c7ffbb8819cd2752",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html": [
+   "8bc7ea6be68546f725aa21d0c3ad3f083c6dd523",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html": [
+   "0d808b1ec10b1f9be2768149dfbaf957fcfeba2a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html": [
+   "4aa3addd05e3c4043910284741792447cd50d84a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html": [
+   "4308e7df30290cb08e9540ce13f99ea3a8ba35b2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html": [
+   "38f6d7500e9eebabfe19d326f849f522ef5b89a3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html": [
+   "cd182a232ec85dfaf02757d1caa5fce9a97c77a3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html": [
+   "ec1198bcc0a89f62bb6817a03c79c150ac24c57a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html": [
+   "400dd8f030028c4f8136db02558cb4001f6d6cb2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html": [
+   "b8d2fe1eff828c6167cfbd0a03a2ca32addc0731",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html": [
+   "aeb7c9702db774ae342fd19a11c3ed9c1ad77687",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html": [
+   "355d750427c77ecbf216e6795fbf274e5f0f5680",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html": [
+   "0c0306301a6c6267764931614e88fdb39927b267",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html": [
+   "856b8ff0fcb7cf81d81f9937ac64e43612fd63ca",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html": [
+   "f7e1fe102b0442508c2552dc6e3f90d2e5ee0024",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html": [
+   "5d4eab985777a84fc76d123f25ee604299bbff86",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html": [
+   "66f42ca5e1c08eb7188d425556a645bae721c509",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html": [
+   "6628969062c880c69a0131506d4b7b6e75107eec",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+   "2f416f3fadb984233b5db331488b3bac8ab0d834",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+   "c12f400257642d84be59cf1753ba36c2d51c3984",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+   "0c946b2a60b1303c65aff04827c06b54f8b7219e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+   "6314ed0f0571efdb24654c27ed792930f1706688",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+   "e2222d539d2f67d4c32c1f476ce091156bfd9521",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+   "bb6b70a0c6c3dba0ca79eca00e947010e0afb1d8",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+   "7ab29972ddffca03876ba86c03c1b7268a5287cd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+   "67ea17399a57fd4a70509b9f8532c11a0b382dc2",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+   "2a9ed86d5bd68d2863428a4c5726ad7e70cfff24",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+   "3755b7370c0c91b8aa7219e7ffdcab46973a1cfb",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+   "e8f21ee67f8c9b8102fa6be50eff59ba018d68c3",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+   "9647444b4b0ad90be3f086c336526f00dec2d4f1",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
+   "71e0dc4fbc1ca60f9b518feab4e5c324b1ac2eb0",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html": [
+   "e6acaf9d214984d49ca240321082090476d143cb",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html": [
+   "56c5e258b8d41f5f04f6389ff9214ee5aef5f2f9",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html": [
+   "393dca701efcd8372f30889108a2eff80c632d75",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html": [
+   "bef4b5cc6101fdb37e98b8fd7d093e4b46c8091e",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html": [
+   "cdb432a486f0e5aa0f28e83907e55c70bffe9b80",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html": [
+   "4983b5c7cfdc307dc039e734e827cce03052099c",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html": [
+   "89ca7bdc2599e4d3da34cc5e4373ec4bd22c7400",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html": [
+   "7f982d17dfbad0142a7131c3d545fb6820b3fa7a",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html": [
+   "cd5e5e64fe25a7448de3c0e619b294b13043264d",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html": [
+   "9af25ed05348c5dba33a16099941219870599fdd",
+   "testharness"
+  ],
+  "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html": [
+   "e9f6ab0574d297607bf1f5d72b97a54bbab2470d",
+   "testharness"
+  ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
    "3d09f39410b25113d0aa00e0782e688e086f2705",
    "testharness"
@@ -665157,6 +667669,838 @@
    "687598c5f559f713c40c6ca42c8c72ee03f0b46d",
    "testharness"
   ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+   "73a54d0606e363fa8e5e33080e5c67e505d03196",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+   "dde2dca8675730ecfd248971e18ad71c6b5f30c7",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+   "7d20b859bfcd2a92f62bc6b4ac832cd249d7899d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+   "b229a783825df971d73ced905885832677da78dc",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+   "bb946976c3fd9722aef1b2f7e64f06d3043a1340",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+   "0447607c3adda7b6e7da881d091f170fba9c87c6",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+   "94abb2573bdfe043cfc265075796dc6ed25ef051",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+   "67aa90a0140333170fbf0772c4b9762e9dbd208c",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+   "98d8a863608880a40b5ed43ef964b96d110593e6",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+   "082d28cf0ab1657b1b33ff8cc3c4a95baaaf917e",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+   "b8f5e9b2eee74615fafc559e114c71742ffd455c",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+   "b8701fca1e2a63663604c2a22243f7d647c481cb",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+   "852c48548e774dbc3971db3ad8c4eae8d207a19e",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+   "749f21239cd7fa56fdc3a7d9518875f28394cb9a",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+   "bd25b6ae13383810ed996bbec96f342e36540710",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+   "01a0db3b9c9428cf2d0644eaf7cc7c56512d4e15",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+   "b77f4d96275fc3c3d28d3f496f1b8e2601eb430f",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+   "2346b55d07a4a49577c1945701803e48fdd20d4c",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html": [
+   "2e9fc5b2e8ba21b0c8e9f587426cc4c171f3f694",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html": [
+   "f2becf509c43f864f435bb30ff70b38766a2f643",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html": [
+   "ce8e5fda9deac1e144c8f21e837479a412d8da0f",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html": [
+   "519fcfd771f2e187e1bdc83520b84b05ecaa0fdc",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html": [
+   "951519b578e5791ce073749a1c57a22226157399",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html": [
+   "db4fc07384cd1afcf39cf922c98c96c4f293eace",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "5a755efbfcad1df66d39031b46274fa5857599a0",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "8e678bcf1a3fb0a460be42591e2a7b022588212b",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "aea6ad113b601c550ff4476aadd96895e0a93c88",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "30e3de6fa27e3e68e3bbb7ba71467a2356620d72",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "1888eaa6e87fe6875f76360495629aa2bfbac973",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "fda43b413b90f4a531f97bc8201238c7b2ea5c34",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "24d32babf89ad68b5bacbb14b463ea1592aeb219",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "13e10706165318f23af2ccbf0be9c57f1bb1d7e3",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "9523eb75477499e061080307cdc8fbc5fa06bd14",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "ca6371b10a2ed1d406f30a4df8d8db908d11fde8",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "d331868bcbdd38b7bf77f09022e40d829f05ff43",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "84b4a6ec83d98211818998f5e7fb8c4d77610420",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html": [
+   "45048211c2e3485bfa7b20dcb98dc8a5b98bc46d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html": [
+   "8263463d658984abad18ced6458f8c226235ef98",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html": [
+   "b79ce484360d85445b97ad0c8c3907991b59d884",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html": [
+   "8b22c200cc1a50d23b1f1a576aed7b44279e9c83",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html": [
+   "b5c20489ea2a4e7ea0891177c462933479e88a15",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html": [
+   "b7a27ad4e1b6319c50ca535d37835bdf6b72e749",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html": [
+   "112477d16f5d9ddb3396d1d2f186005bab52d997",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html": [
+   "d3435c8f8b9c0dc68c3f7084b94466a0809e1106",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html": [
+   "b5cae623be9800afd541db655f493beefd7f84da",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html": [
+   "e12a76d5f51f8b7b9c32a3304e5ad0a880123289",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html": [
+   "5cae641dd90d77a713356404188656dde99d377b",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html": [
+   "cd4cfbb4a2bb17e793e5522f39eb292abc2e32e6",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html": [
+   "6f244cf90b62020677e6dd81a059747737600636",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html": [
+   "fa464d4cd135f71943a11f3430ba4ec9fd036c40",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html": [
+   "03f8d486cac0d52321a9f917829d44a6b3c792f6",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html": [
+   "bfbfa6a111f4e13dc6009fb3290436978fae4069",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html": [
+   "47a5b80e63a58633c37a75e1507a48ad1697ae0e",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html": [
+   "eda77bf2c216200a8eba0f452a822e947236f825",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html": [
+   "e150b5417246de36384298490cec910444ccc6ac",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html": [
+   "08e7c2ac7b0c5b85f4677f17f1a9a8ceba0ab5fe",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html": [
+   "966e46aee1407cd200ac139775337838bf4066a9",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html": [
+   "20e1972f081d3831ba86c1fd67a3d11cf7ecebfc",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "a833bd94bfba711baba03fb3866a24835d4f56a5",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "700d8b4a809782be855b043624c44bb682c831fb",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "7f14039810a75e7ff815b7089fddd5086e352c02",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "df937e909d9a324736bf9dac6d76cd32c3426ace",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "96d97ac1472a78b7cb0f4ad213930ebd2347e8da",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "3c4138b85899becb5682cf6ac7378ba04842137b",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "c31e46e63296c1e7c4a7021d74b9e88ef9502527",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "8f0780023de409e4176d5a403088fbee45f85ec1",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "70f0b1d0478eea58f9608ec56575a1b90603533a",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "36569eb9424ffb5f2a3657d5ebae8a5a514b285e",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "c849230bf4e0e78daaf9fe469e52bad95a319cf9",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "d731596f4fef64110f832c6fc6819b106ca34d43",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+   "cbcc9e6295bd39535b8249fa2ea888545a3fdf29",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+   "5bab0474686dbc5c3a280e269178099bc03de2ec",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+   "0e04f73bfb6e6f308b46ac57dc0e1fa8f9733adf",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+   "b85fd83fd01ef3a94a34f37e18c45d09f6f2db4c",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+   "987252ef12ad6c96ee4d3354f5d352251cf03503",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+   "ab026fea16a8e68a4c3c1e3c89479e471f074510",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html": [
+   "91235039e7c7be736f200417273a0369561c4751",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html": [
+   "c539e7939c75c4d19ddb0f8bcef3d3c66d2669d6",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html": [
+   "47e875fa08ad4aff215e4e62e08a877def0ac6ba",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html": [
+   "107b56fac1d11f31634e61f3a2113e9d354bd4ac",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html": [
+   "9374644959d1459b79f810070ce411a637db8681",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html": [
+   "d4116816fb489ad16f3aaa85203b31edd2600e84",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+   "128269f6f34d2a1d8887d1a4715dcb2843da5b16",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+   "43a090f1ea591108c75d3987ab8d4c667133cbf7",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+   "c50f2a266574133a6e0807cd91c2c031528502b9",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+   "7af9e18021da83bf814a36593c43838e3679b361",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+   "3cbf28d1ef8bc44e55f73254c8e1c28b2b2b137a",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+   "364c09c82b766c0b6ccffff515c0b54501bcd8ed",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+   "67c68d77e78915db1d50e1aa8a314727077e4e62",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+   "21567b88c751b70fea1ad0935e9b3e8dc630e4e8",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+   "6cf498f4d04a047c370273c93a203dbb90a3de1d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+   "95b69478ba2c2f1f053dbbbd9732192ed6343a3b",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+   "2915ef603c7637c28e861c26913d87d5197bc989",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+   "f1ce7f4859af805a0946398e9594bca4f5299d36",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html": [
+   "3b5c6087ca7d23daef1897071a7c8f82726049de",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html": [
+   "777b6de1ef037f340cebd821a4b120bd0cac6f06",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html": [
+   "ddb55bb3adf9d8090f6d5131048799735a504e9d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html": [
+   "c663c20976705c83a62dbea6ecc35274a004132a",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html": [
+   "5d7b3c942502df94cb354c8e9f2b28907ef79c18",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html": [
+   "0eb10a224b464bfef1a8e5c698a47060515de9ba",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html": [
+   "e413286edeb151f4934992f9c7f31e64a977915a",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html": [
+   "5e2e08f3a755c7c55418316580bdb7e58710b187",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html": [
+   "433bae3c5bbcf5c4382445a5ab9f3c8404d00074",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html": [
+   "762b46f345f1b6f523d897089782c5be8b13832d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html": [
+   "27e5f716b3a0ba36d2b3e7325887f76c7c8668ef",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html": [
+   "687598c5f559f713c40c6ca42c8c72ee03f0b46d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+   "1290d4b8fa522e241333d53be06d22fd10ad01c7",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+   "d1f8d31f3a3428bc0b662dcbb458b8c73dc54d42",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+   "87bd5751b0c98edfda601ace579698fed878a8fd",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+   "15212e5efd628c1ae81a9d099b636c22ac98df90",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+   "599115560f1713cf07e983f84f221a098026787d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+   "dc2e2c1dfb60ceffbeb389653ec20ccc0ade0b45",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+   "bf36678d942491ef88e1c95d904df5bdf2174840",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+   "b6e4f78ac0e2ff8909fea70dbf2012e682d5ee5a",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+   "789d0834f9f4e87eeed9ce767f5feba996e718fd",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+   "ba4f236d0bdfa50b045afe2ffcec1b8f47d7c0d4",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+   "bcce26cb8a84bfb2efa6a9c6294f1fb462833514",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+   "7d1f847bfbe4bee5f9d4d948d0e479218d500f6d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+   "8e8157f132397f20cb6f92ed8b3b84a96e98dee0",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+   "c787fab5c5ff902842c3f7bb3bf690bd4d934e83",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+   "85ecd7925a9dea8ca0e6515b91ff45a6d7a0f5d8",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+   "3c2becf7698240eda340399e5a0fd9d15f9cee96",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+   "5910e67c5b7ea6d8b43bbbf31a300c78db7f89cb",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+   "7c3936290ace602f7c11724d64171da611a0013b",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html": [
+   "bfd6fca8711604edd8ff27567830693666403860",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html": [
+   "a42e41721deec317cee48a8db5c596af0c0b262c",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html": [
+   "d6e26a3f4686d3eac789de7410e7783602384032",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html": [
+   "7fafb911930527fe6aa45ba3d03273d4524514c5",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html": [
+   "3b173ad5f28da27ca7bcbbc2830c8f1e0f073646",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html": [
+   "38058437bdb32b0c9949b84ac798b240a27f4dfb",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "0e6a44ac3a06061af919a9fd1c37fb6176437792",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "1117b4daacbf5bb39f58653ca969b1a140af20d2",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "4fabfdaade33a78fb027a7834723ac7b5df6e552",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "6c516602ca5367e5730ac430d853973593571334",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "a206e2ce9c4a452e590230593ed9d2f7b5506b1a",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "6f8028c1dcc7a46af45d20b3b2f2b0d524d896f0",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "156377f90e3ed4d952832a00e57ae19b5afcf33c",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "a172b10f9522963546bb67bc01cdfad10066831b",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "a7b1b7c91fd780957e9aa204f5922dc569b9c4dd",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "d55c76f88815eb5f4bf58ee89d28f9510fdb7885",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "041b67e71100faa33007bfd8957a56de43c9d87d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "c08cabc857bb5966c0baae7d0bf9c2db26a7898c",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html": [
+   "7bfd0d5a840f2a4076d4bb7ed7eb90d50b567cd6",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html": [
+   "de704bc0943efb05f0124d4f1e3c167c8f33acca",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html": [
+   "ca55f436c55264dfe0ab0cb4fb4ce47f3ce9fd3f",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html": [
+   "e3219a49da29e3980b7427204eca5a40a4bc2872",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html": [
+   "a8f3516ebf59071b710df439e724b4dff10162ec",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html": [
+   "ba9489b6a34e907c76fe98aad86bcbdb9d0eed27",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html": [
+   "c077a8d1811a0810c5327bed314b725ec018fda7",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html": [
+   "ef739c129dc78fc4d09b70bd7432d00aa95e5517",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html": [
+   "e8c08f0bb884777c04f536c070ad4651f075a2a5",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html": [
+   "62c9e7d2b72d13373a97193e8c9a8e147178923e",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html": [
+   "46630082600aa7e4adadf42ffeb0eb7acd9eb1c3",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html": [
+   "8188643ee01878a639010e0208574d78f6a54152",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html": [
+   "018c62b91e0f52e40bd11ef7b2f784a16cd11aea",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html": [
+   "9597e24bdee8e2c523c9d2e4f964e658f6bc9229",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html": [
+   "5e2643d7fdecc9bbe772e8f7ed198aaa71c61583",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html": [
+   "01dd5f805c4212b00d199768dd2cfc69786aba11",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html": [
+   "6a182a3108f9f47f3aa5ec5f83ca14e68fc90177",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html": [
+   "0bb3681fc9700ad4b25d23c25dfa15e0264c78a3",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html": [
+   "9440f4f487f902ff3c976768b743876e0793f6b7",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html": [
+   "8abdf4c327c4dc4fab935ab931b745d28d374f0d",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html": [
+   "ab275ebc17263f35c056237ee8276efab7bc2fc1",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html": [
+   "937b8b13d55e7e80f6d947ef9096339ca6ee7d01",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "1cf47d5489471496db2f7198b29be1172223b528",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "5c3d5e225fbb2fcc9eee4f8ad30e00d434ff9773",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "8f56a7b04414591098d71bb59b5475ae54feda69",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "2df7ef6981133d05e4665ec1ed53da462e78e194",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "d45c07219b1ffbfd017de2e0fb058747854621b5",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "c888bc339ef28dac1b3e9167d9b9287cefa5cc02",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "529912b2e588f16646cf77cec2f07563a63b88c3",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "0ac61caf3a1f6388c842bde472eb8c048df492f7",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "e1ff0869a51834ad4e7c97dbdbea6e7b929cf211",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "93b50e5f77318d0e8d5924bdec875ca7f4fbe449",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "a63dbafca91e9c49ed928dd232c38b5909450e04",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "841b0d9e6ede6886c9558abd480325ee23248509",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+   "aa408aa6ce5cec91de1c418face28e3ed2c21388",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+   "736d6725afacd12e80781ceaa06827363dc027ca",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+   "d5513b4dd0581dd7c0d374143ac542a72b8d578e",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+   "82f0a1388ba6f2ee91493c10d0083b77f21844a3",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+   "a72cc35cfced8ca2e1111bd8a16430f05be4cd03",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+   "34af6d0fc7f926b6ee0ebce95176d0ea9b1a3979",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html": [
+   "625fd8cd6280344a3639c198f31d80f0dfebfdef",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html": [
+   "78c721601ac8b8b94ec1695997959c02295ce695",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html": [
+   "03933e69756648f786e09a4d886b7b0e204961b6",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html": [
+   "9175e7684c8feec0dc35a4cb5472b71f01627b40",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html": [
+   "0795eb4161ecd718522acc3b0377fe16a25d0c2c",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html": [
+   "42dd0f137010ae9e79afde8a9c556aaa44c86516",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+   "e97c1e5dca04bfa76f5a04503fecd0d90cf89b13",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+   "631218d1148df1f8cb7af89658616d9ad0eb06a9",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+   "b84afa1a439d6b510543cc589b3a91178034a2c9",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+   "4873ce43df24572d3ca085d755becd77fb3e91bf",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+   "8b11a32e1b8f9148619fa10cc18bba7ab14b420b",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+   "b6ba1e9cf8717703567b075a3a96b88797b568ee",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+   "edcf94103e41d7365386d0362bf0767ee9f6f900",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+   "8f0c25275059cca3da918d691b9214f7cc9a97d5",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+   "e7f9688518bcd6d06e5627f58d8965c37d40862c",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+   "c5872b8530d630319cd57a042b5408858540e547",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+   "e3adb45186d433ea95ea798c6f7329ed8867be47",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+   "1ce7d0cf3fb2b2227c6bf49add6fbe29302397b5",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
+   "b3d2b544a9ca9896ed1252b51069e7e606e100e7",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html": [
+   "9a007d0d84dad20dd2f2cc6e8d5f17f6292af7f5",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html": [
+   "c00e4c494810b26e25c359640999ad5da2ab999e",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html": [
+   "7c74c41c237a07e6665cc09e32ef890d703d8be0",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
+  ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
    "0b035d26e380f2c60df65b3c26b1b741d725d432",
    "testharness"
@@ -665685,6 +669029,38 @@
    "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
+  "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html": [
+   "b25074cd916fe515d0a3f88346b4158618ed8abe",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html": [
+   "650c7619ec8032933796e525d4cc2ad09f2cf627",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html": [
+   "4a450355f01cc340fcc7deddacf60e3680d60df1",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html": [
+   "40511c7e2c01279a27808a38f967811757f59315",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
+  ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html": [
    "408834c03d724826f0efe22a6dc8d740c0438cd3",
    "testharness"
@@ -666213,6 +669589,38 @@
    "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+   "b46e7be3a0b521f4dfe674e2c6fedd2c3730e073",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+   "a0a310b7155370f076ee1b0534639164bf77f25f",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+   "298a038279c1efd97e03edf70c50356c689ada6d",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+   "758f12d5c44debe2d95bdc29edb24d2d94ef6275",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
+  ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
    "75f4815eb6b07655aeb3b902cf04308a6b7e4a3a",
    "testharness"
@@ -666741,6 +670149,38 @@
    "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
+  "referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html": [
+   "4a20e9e4cc1bdb47bb479726d77cf12ef236ac36",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html": [
+   "e7950f912ddefc7ccaa27efc2ed4ed776f9f5ca2",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html": [
+   "d33231cb38c0ee6cbac6f7e030d6083c66b5d689",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html": [
+   "b5626c7c0dc2d538dff218149c947895f2928ad9",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
+  ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html": [
    "6cbfb06d497f003453c4c8926e770ff9fabc9f52",
    "testharness"
@@ -667269,6 +670709,30 @@
    "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
+  "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html": [
+   "ed9a28b65ace96275538c15926159828c3ee4ad5",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html": [
+   "754471a9cff136c10e05fb837d22ff12796adfd0",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html": [
+   "0abb0a7d9c4a812e68512107a130e68dee70aa99",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
+  ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html": [
    "b0c2bb827833a0b7063db45c84379394201abcc6",
    "testharness"
@@ -667717,6 +671181,38 @@
    "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+   "904e587a6a1ce0f7bdd99a912429186a4255df5f",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+   "cc8c914c025d7a5f162d921822f859a3083047d6",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+   "010acee655a5366cb0781834aa554ba504b58267",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+   "2817325cfc578afc873945500a3d79c8bac9a53c",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
+   "support"
+  ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
    "856bd37ac9bfd9bdad5b035c8e4573dd881fb8eb",
    "testharness"
@@ -668245,6 +671741,38 @@
    "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
+  "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html": [
+   "cb4f01f6c95ae681cd9f7e09d125f1cab8e619fc",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html": [
+   "4885fbe1ff0d3948fc20b4a0e9e8a83048090c12",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html": [
+   "cc1c78f8beb04f1dc19aa57a4a5c62a4447f706c",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html": [
+   "d20d8611d74cad1aed6781a000d262d976741cd0",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html": [
    "057180a979d20d361e63af85cf9213bed202a51c",
    "testharness"
@@ -668773,6 +672301,38 @@
    "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html": [
+   "7b2775d373bd8db293be5e024e7264e54be048f5",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html": [
+   "f3d2c9bdc3383d8516fb1d64fa5687194db54f27",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html": [
+   "260ba29dbdf8a206d3c7b608896c702c36af0758",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html": [
+   "d676d8f2a31466e0dc6d0ca79b86acaf2801cfcf",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html": [
    "46f755716fbbe8abe1eafb384de782154f034f0f",
    "testharness"
@@ -669301,6 +672861,22 @@
    "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
+  "referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html": [
+   "ecec5f91755c7d2352c01847c5918a4a2b7e3d5e",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html": [
+   "b8e0cb2bc50da7bba2e1d89073d389cb2423a523",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html": [
+   "f5ef3b71b5ee36efafa07496f31ad59faaaf5bfe",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html": [
+   "5d78d3f8550b49d8b958c68df0b69ba620147a3b",
+   "testharness"
+  ],
   "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html": [
    "ea2e8d1194859594c01f573e3f3ce5818566a9cf",
    "testharness"
@@ -669565,6 +673141,22 @@
    "d868323f574937678d6a273346d62421c5cee6a9",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
+   "9c8bd866dd329d5d98a148fcdd1dbdc477659bf6",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html": [
+   "847ff9e0748cfdbe53c3cb73377a9d550d11ebe5",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html": [
+   "92daf1692d51e531b3ebffd24c073fbb163ca7ae",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html": [
+   "83b076cf3617724ef0d2a8ed6dc0e57e7fa5ca0a",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
    "d5c1ef925326b8b7a5a78dc0d38c0bcf20ef510c",
    "testharness"
@@ -669661,6 +673253,54 @@
    "99b647b458a3e9f4f6a3368160bed2746a710532",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+   "644f9725974eda7af5f52fc2f116d55aeb26859b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+   "33fea42d09700ce4de1027959a42f85c7b943919",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+   "9141367a2a306b7547a4246382cd216c18999f23",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+   "34f144f635c5c827d8b764b54049d5f3219abd35",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+   "6e8c01be69ef1d07026cfbdf4174947777751628",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+   "be46a6dc0332ac4ef0ad170dd840f31c4e579bf5",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+   "c752d40de5c91d37a77e2659fcd4c1a8f191656b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+   "3ef5e2da959b1d78097167fbd172a7b901298ff8",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+   "5c114376e21da7df0215e84279c9a9c626202bea",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+   "973f18e57c5a4497c918109e21559bcabc032dd2",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+   "c920708a903ef9fa581563b66b57ad3c02e39a75",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+   "9f7674a5ad93e501d6d950721c2d429c43c006a6",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
    "b09756f12a1122df07c522daeb9dc77452f6a153",
    "testharness"
@@ -669781,6 +673421,22 @@
    "71d97ee0390ed6ec4722b99571e6709ea46e98bf",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html": [
+   "980bb085e4b1bde005c2218fb07b7415e5bb73d3",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html": [
+   "1a5d8286fb3112a6bb00fbccbd9352b97f6359a2",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html": [
+   "4f10b1e49b8819d33fbeb96f0bb063438c149333",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html": [
+   "63a5ac61022cc0e3a0aa18f59104e0d48f153982",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html": [
    "29533784c3f3365ee57323ba9ba5e301a3071f6e",
    "testharness"
@@ -669877,6 +673533,54 @@
    "60516dfec7970cd8a05d886e8c71daa683edb73b",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+   "72d12ba1680215e8c9de54179bcec523d2fdcd50",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+   "658b2f530581d4d519b18654d1b295379d09d8ef",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+   "f11d265a7036b1fb8f28d14928b4e1c6895a3cba",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+   "baec2579bb94ca1b143613387b57cd9f1681bd76",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+   "d42fae6dde199759456e48d3f3cb0b6b19d476d7",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+   "673ca124b110ebd1d78928909e4fd14da8f6aad3",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html": [
+   "a3bf29152e6a601293ac8e034957f8e378146f86",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html": [
+   "41054cea6dbc6576a0442805282b878fb8050b19",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html": [
+   "c19243c1b2f398c62dff0dba21cbf64cf072fd41",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html": [
+   "b0db7e1e47ba36d01d09bfac2e5e67a7c508ea09",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html": [
+   "8b4f904725881d300331b24d7a04db964a207fa5",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html": [
+   "fc4cb5066a28eb03dbf9304f367220b492cd9828",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html": [
    "9574d97ad89759a77330fd9e2ebd4e1fed6933a3",
    "testharness"
@@ -669997,6 +673701,22 @@
    "98b4af4aa36a0149db3048b2317400eec0cf1f1a",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+   "9f8d2dbd6ea63d6e864923b1cc1049d292c50b6f",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+   "4fa25d16dfbb2e87888c4960e55395bf53017488",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+   "f4108e0c84c4e3bb05b88637f4f195a3cba78b7a",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+   "861785570188e00688d09e326a4203b740505d73",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
    "74384c6c1f4f74a89cf0a6b9ef86055d207cf664",
    "testharness"
@@ -670093,6 +673813,54 @@
    "f29d9a5f033972703a092c987b0a8ae9a8010d39",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "ccf903ea82551c9e7f700908ba50f32a1bbd99fd",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "7809937046fec61f3f3de3f8be747028765d9e69",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "741d65f96b8d02071c809f6d5a8821fa72c9245e",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "41aec2926ab024cadc43c90cdd7f0cc3ec7beda9",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "0a0854c5f0064d26e845ace4440a7ef79ef3fe17",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "2fde6cd1fc1142344ac8d70b230a740627934a8c",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "c31f94ce0ed1acb3e2abd65cbeeaad1c3c0e06df",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "9f884f2b3d4c1c72db295a30583b6c66370b7dd7",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "bbd05a14b6d6827d4f90047f8bcecfa221595714",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "8931fa10ea2bf66c24eed9af59c91f3849904339",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "d1da9e8df1ebd9be955f95291d8bdcca3ee825d1",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "44b1001f7ad4e2f2bdedf530d60dde8894344f33",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
    "e2b5a99d82bb90a702d72b5b4cb04f5a5efa9ab0",
    "testharness"
@@ -670213,6 +673981,22 @@
    "3a3eeacb397fdfcb07f4da4ce651e36272f74eba",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html": [
+   "98deca71afd02be3779e96d0cbe81613001c8608",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html": [
+   "750ee7a261dc50b3728b9c5f24c41b888e9e91f8",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html": [
+   "eefe1de9d79be3ab40742d9792e908cb48f32679",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html": [
+   "8774535db2f3e7c9a0504829b3da77b693ffa5dd",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html": [
    "867e453f9c923119a7425c57cec7f5594c8a1494",
    "testharness"
@@ -670309,6 +674093,54 @@
    "64567589fa4012692de16ea36728adf33e102bfb",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html": [
+   "31f315594f7c203114af9f87e1559ef18e4b5b99",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html": [
+   "388e2e3d5ef06c6235d833b6821f7816fd78ab99",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html": [
+   "2060eb73e2a274b5924f3b2d863002be23c454c0",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html": [
+   "8cdd906fefb3af8db7feb457ef83a2e2033e7977",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html": [
+   "2ccf63de2a5e11fbc90386a788d75c28bb51b38c",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html": [
+   "de0232f3093ee11283f81e2de43d549dfdfc3153",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html": [
+   "e08f79fea32fb84009f9c627a795704f91c78e56",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html": [
+   "4a2fe1989f8c5d7ef0bad94338362c8990be3e5a",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html": [
+   "ba963ea8161037ad560d59951e1e238d6b1fb228",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html": [
+   "9828fb13d32062ad2fc7643a7d17c7360d492490",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html": [
+   "596648c9d81a278f361ca5600c83508917cffdb1",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html": [
+   "57809ed969cd72aa80eb3240cd3aaada9e6e7b7b",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html": [
    "2494c0a49e8d42e26438abbbbf9f326bf115ffa2",
    "testharness"
@@ -670429,6 +674261,18 @@
    "674b324bded844ca9826eabb4e0d1769cd001f24",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html": [
+   "d3aa109578475d97e0af95a9fef9cecddfd0a588",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html": [
+   "e0389bbed250fbcafb062b9917d3c875b53ed127",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html": [
+   "0da426466251f0d409db90069eba6ef51d1d8bc7",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html": [
    "4623293b2b98547b4f185ddd6ca3b675e5e582e6",
    "testharness"
@@ -670509,6 +674353,46 @@
    "84063c89db2fa5425c81f4a1f32db835ea6313a2",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html": [
+   "3c17d1b5424364eb247e06b9807c0ad146ab7f84",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html": [
+   "fcf85f8024ca1b4eba4b8220eb7fa80847290c47",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html": [
+   "7879c9fd7456effead5151f17e35dceed34593b6",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html": [
+   "6649f29229bebca26b3fa855627818d0eecd0a49",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html": [
+   "24c4a92ca766a2b995bd835cbeabe7c213d7afc4",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html": [
+   "21f7a5d12a41c19711ea74a4a0f41bbff5250725",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html": [
+   "67c0f8605123991d5dacde2181d9303d9838c0af",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html": [
+   "78405b3e0d1bb9b81d6982d00b483cf669e820ae",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html": [
+   "1664af89ced792fa4b87475adac9510413882fdb",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html": [
+   "5961eb3873e9cf07bb5bf316cdeedabc36a2769a",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html": [
    "b7e3924092b5dfe03caf3d7a44fe3c74251f41b1",
    "testharness"
@@ -670613,6 +674497,22 @@
    "c38435bd25c4a9e1af2cc98a425f74250c728dd6",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
+   "9d8627a6295a4a88b560f3d411f7e15943d53a82",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
+   "13a8c4010042cd5fdf81c7c7e97e378bd945fe89",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
+   "273581974f3542a3360b69121afdc2290af0fcf6",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
+   "cf8d9db6dd053e93940bc2afb4a68ba81029ef1b",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
    "9b79a324fcfcee738da044c448e3bdde7fb02f4d",
    "testharness"
@@ -670709,6 +674609,54 @@
    "542d4e266eb66d02b94d8648bf00f53690632770",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "0bc478bdb4a8bf58d7407867237a0512fef67273",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "633f09a54d0e25b0f633ad6fe95cea5ae920e205",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "3cbbe67933656c79ef6c175049d9f79307b2d0ef",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "e27ce3575485917626d80aed91e668faf1c6333d",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "4be0ccee2a770782e37c36b40ef9ddf5d5118da5",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "067b138ef63c5678dfa458437833a7b345367769",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "c4dc2e35291eaacde0fb1475cd615a263d3ff746",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "62e4fd74770e4f6b2d43d7053f57d4beb07bf749",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "ea104b043950af7df52b18654b9a178fdd9b7a33",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "d9cda36fee027ee70f604e382a8c0c14a5d5566d",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "ff8d5d23377511f7fe193058d865e9845da354ce",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "1c8f979a86a74540236cd6a094b2c478532ff4cc",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
    "c076fc85e271074ed2c28d8f6fe73afd399cc9e9",
    "testharness"
@@ -670829,6 +674777,22 @@
    "2f861ecf84f58860a07b6eb785b43b3d2cbd5a88",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html": [
+   "3ab858bf1d07d7d7222129c6d083454eabdcfd1c",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html": [
+   "678f6519c1b14f37fb1ec82fc0a95c85c8631984",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html": [
+   "31bfc72a14198c368eff7d995fe906e8c4f3fa46",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html": [
+   "384b25eaad2758bc9dac82980da194befb56479d",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html": [
    "86a8cf5916aede3dcb156b2c82e64c7d34f1781e",
    "testharness"
@@ -670925,6 +674889,54 @@
    "0abed4587638b8a9cff2d390068cc2774f0831e8",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+   "8a2a3d96af53d9a8eca30e43d9aa86fa5a8a46ac",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+   "9632ab1732e1ac8d32695d4b0415f13ef4dc5a1f",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+   "1cb17c098e88a8602d70086e79cbf918f9777ae7",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+   "792f7b6845d07d1e1c2142f7ca404432a502b991",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+   "a26129490947c5a9d6693a08530ef60a2cc48a6b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+   "4371d890f869f151ac9bc19c1017614e419a82eb",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html": [
+   "7bdc0eb973ab13c8da8ea61a31c84cbe1332e475",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html": [
+   "faeed2098989e6e782a0ff869e05625395e29535",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html": [
+   "5c2ec37a0405f87e46250628fc0cfc6adbfa960d",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html": [
+   "846d91961a525e7246fe333dffcec2bd783447d3",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html": [
+   "207c13fa7cf11d91733a38610d60783fb3517ed0",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html": [
+   "569d109410bd4e997c11fbe2feaf078fc13944cd",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html": [
    "eaf16c30210357a1848c014c0a772429d78474d4",
    "testharness"
@@ -671045,6 +675057,22 @@
    "20f964044e23c3da3617b862e57b1c8b73dfa0b0",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html": [
+   "a77024c16c90e52f2a9d2d166e99672821674697",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html": [
+   "988679e223c5f72baafe1ca0325fe50fd31d5210",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html": [
+   "0bb2daf32a546a9ef437e6b9dbfc87b18a3f89ef",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html": [
+   "4a04e98eef946f1f956a1c844b09233387095bf9",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html": [
    "383a91559b3aae9937feccf2aeefc290db9efef3",
    "testharness"
@@ -671141,6 +675169,54 @@
    "af08f36ef37e872dba30338eeccd4a5a42cf6b31",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+   "e53473e72bd3cbe93422f4bb389664e37cb32683",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+   "900968e3f5aa027e2bac9a1793cf405cbf3bc6c0",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+   "69c5fcd0cb774aadc0d847d4ea5d4642f6eeee7b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+   "a1204da872684d0dec0317ec07776304ef48fd34",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+   "3fa1e11ec5a9a464262030af4cd4ad210fe375e4",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+   "c2d12d62cf4e78a8ee57ddcdce60b06ff132e7be",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+   "4ab2671a8d4def76d7838b52bad46be64b33f05e",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+   "bcf0d8379f789ba8adf0af95a06a534b01b01235",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+   "e476176f2712f8d2429a809e96265cf712e8348a",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+   "f7737b87716570c592e8362a9c1e98d804bf1162",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+   "73ba6d68d929209f71e80a1a7b1086b502bc1e72",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+   "7602c523a44489fec611c65f56863b643f0dbe7b",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
    "95b58fa5d651248048f5edd519a1a99db973f9ab",
    "testharness"
@@ -671261,6 +675337,22 @@
    "189c6bc5144eefa32fddc7b57f58e575e6a8aaad",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html": [
+   "ecec5f91755c7d2352c01847c5918a4a2b7e3d5e",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html": [
+   "b8e0cb2bc50da7bba2e1d89073d389cb2423a523",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html": [
+   "f5ef3b71b5ee36efafa07496f31ad59faaaf5bfe",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html": [
+   "5d78d3f8550b49d8b958c68df0b69ba620147a3b",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html": [
    "ea2e8d1194859594c01f573e3f3ce5818566a9cf",
    "testharness"
@@ -671357,6 +675449,54 @@
    "9efcc95c2aa98335f7613d6d2e53c2550defe471",
    "testharness"
   ],
+  "referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html": [
+   "3d9206f18f101b20ceed0fa677ac5836b1db9c30",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html": [
+   "6d5c1e56cb2cd0842d8ee456ce73b707edf196af",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html": [
+   "51596668d9399022071858d762337a0eafb9ddab",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html": [
+   "9cd2d1ffee576cf75f0fe9481a5f8697df675b7f",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html": [
+   "4d71131d9b94a23961efa78f075787d7cdd0f432",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html": [
+   "29a55b7627240b528710a4393bef43f131a676d1",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html": [
+   "09f9e964f66baabe323a038841b971e35119468c",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html": [
+   "ee69797376a02ae0c6d090dbbe516fb40048c482",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html": [
+   "8b9f2909c649220a721ff71037e9c27bc6216805",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html": [
+   "63ae656a1bc084f439d34a979f7f161d6c26cd7a",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html": [
+   "63a3adfeee104f91c678d9ba8ce84ea5486b2117",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html": [
+   "bf559ef2fa1d63406597c09ed5fbd3b21847c613",
+   "testharness"
+  ],
   "referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html": [
    "e49bb460dbab8b926c3eee0e8e6e0040c6fec870",
    "testharness"
@@ -671589,1258 +675729,14 @@
    "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "ea712646bb16025d8bf0e40aa98104a490a7065e",
-   "testharness"
-  ],
-  "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "0d592b59d40b62543de7b7d2d25d55817f0bdc17",
-   "testharness"
-  ],
-  "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "8a3731927e0f015697c5b56248a63c7345d2d195",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "463728a4ecd9cd592090b5be6648bf2d13251d54",
-   "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "21ea496ca4911832d4fd62afdde6470fb5e90b9e",
-   "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "cdcc134dedfdc84dce7975df662466bc56115032",
-   "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "61b962276bb7fca9cdb6f247cbf6e691210015c3",
-   "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ad75a53979dcf904fdbf20858080192491feeb55",
-   "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "3ef49b93f0f6fb0101e1ecb94d1cfc42a3b15986",
-   "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "deb4132ab084ba1f8f0db78ca192c189de3bf7f9",
-   "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "1737e72548c1378be77074d8d4cfc4307bdeadba",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c64034d2bbd16777ac5d20b18ae662ab59d3d984",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "4d0c946bd7a58083be4fe854cfdcb1e7e6455705",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "2b1ee01973e73e5ffb1ccae3229e22d98b9f673e",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "fa0accb2c068094a4d718f9d21b69b145072c770",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e1b79bca8050de32a3a38ef93a89cbe42b9d6206",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ceeaba32d598ec2d4ac74c2e59268b9fdf6d59e8",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ea8dcab7c7d3cbcda26f73eba6059a28a1085251",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "df88f442fab55c2c019ea63aa679328370cb9fd2",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "455efc4ae70503796438569eeb318d2ff1c1ee95",
-   "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6b29a191efeddb78168ad7a1cbf4d1c5ceff38de",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "eedf34f796da2a92801d91c3d4b2504a5f42983a",
-   "testharness"
-  ],
-  "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/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/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/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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "f6755e99add4f8a615fa20645d01de2511c82563",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "9ee1de48295f458eba00147cb56171c95e16c428",
-   "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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "0f512823e8e0aff1dc30b0a5502209c7f345480a",
-   "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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "dde31a65bfcb1601ad5d90fbffd44c19d9b0ce6a",
-   "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/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "6a5f3c4fcc596b42e5526074503660605fd05b93",
-   "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/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "917c0b88847819501699fbe6ad08a051733f3376",
-   "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/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "ebb93af5050bc08a0d6eede2fb8b83f3e9d27977",
-   "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/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "5e12002f256403ce8c705288c4f355b46a1a6965",
-   "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/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "d0ab6e1ccbef74310faf625f60d9af70d72bc1fd",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "8f5b1a70b2142dfb6320ae13d44c60b2cac64b2d",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "086c8b1a047cc3ba7e61205a60206e70e993466c",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "d0e05376f09fbadadda908b63a078e32fbd7e051",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "74ed8a8903d259d0d87b1b3b533139f5d319b240",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "41a4c940c123b583128beb4108ba9b3015831712",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "37879ce158dc1f54d51f0c55ed0e13e56f0fd2fe",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "7bab6eff28eabbc0d69644c50a19187d35833fb4",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "b874f1970b1bca5501518450a7bb010564e39037",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "ce4957f92f0627ffbb6671041b6542c0f178d110",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "08dd0a18a46d224e8b1cec1af6c5457ce4d58d36",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "d940fe023d54829d7ed596fed8cda5494443aa1c",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "ae67228e393ee75705d7bc4ec3d5d2f1f700b847",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "edb49e27f2373a118de1577cbed512295881f4a3",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "f48a02175888868fb4c780ccd50b6912e98bf9d0",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "795774b4006be2c6bc9a0b97ae1dbdadde07945e",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "8d4143e4ab99b882344ef6834c6f19349d7a42c4",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "68547fdbb73d4ee73789d666e7972c543a14ad48",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "acf4458a1689b5c795a95eba30e6edeee0aff946",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "6f57c7c4b2b9558f11798154d188bb686f6ef00e",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "e2404361ecd2bbb8706856973981bc90bb249e6e",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "66660f05264a01cfdce44bfd97a038779e88e6a5",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "15e978254242857952ad19120cad564ef067c1ba",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "f5e38ddb803aa273661507ba2a42637341779fcf",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "20dfb8a3d66188260044fd662a9f3f149f074fa6",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "661a0cb964cd6b0b14f7a277c870bfffbd7353d8",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "4705a1988873dac499172e22df4f36c344398403",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "66310f711b537dec29306f740c8cb5f5b53da190",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "79be70d7587779fcfd23529c9251da339455790e",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "d3a7d9627f3b57aa3e07d62e4b943dcf9a17772f",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "4140287d37986189912e979a0a75b4e627e2c8b7",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "0816608f10f042d610c7c469a5864a7bd499ca57",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "4af019d39fb30048889d743c6f9653451327524f",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "fde81606e41dcf5948de750eb57272b14a6133cb",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "930a9c1450c6133a6df2d1eea83cb9a5fa5a4022",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "8d08d63d72816a0814a639fd708966c0a921ebbb",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "dbbc89ead389bafce662b3444d7411fc17db4a1a",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "a190ee179384a86a74ac1ae3b901010c5a984d30",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "3a1d16bec4e29e788a970864066efb681b38ca79",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "572d84007c955b07ee118f90ce179646dd9bf1aa",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "c1a8a0a0bc23076f71a86da443b196a11377cc10",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "e1a27e3fbae7587f7bb8c921f86239a65a8cfcc2",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "121bfdfa4683ee7197370e56e7680f7b756d8874",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "3780ae41833ddd01d7bcf3e790d9b2a406601812",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "ba1fd4a411064963389efb295e796a45cfa8b6da",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "a09e04cd22c2a723fdf60bc8573bfeecc9e3f4ca",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "9981baec4babe9416ad667f22a95a34e6d8a063f",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "c2a92aa157e3240e589abf87de0620682140356d",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "80165257482017b8d00e0ecafc47097d68bf47d3",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "33451710956896b1a2d7111680b6c408b4bfba12",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "c444cb95402a7a5a85386943cf255fc4d5e0c3df",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "8d06c867b75f9f578314c5589a0e5726dfb2fe9f",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "96ac4f9de15e784b4d8143c753a3f81d49c361c4",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "ec0a21e2db1347f1193675ee6b441351f7b35663",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "6255a8d29cfb3c1c9a73b1e3afe03bd9e62a969d",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "b878f3839f2423e6e9461eef3ecfff98c4364dc3",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "01179a3fab96518fdddda0d4b42f336658874950",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "5072cbcf152f74bc9fee63a69c514d1d984987c3",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "6941a3a73a35a8380b5d738588f84a7172ac51bd",
-   "testharness"
-  ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "cf296add12bf0872948c65bd8042cd1e74869100",
-   "testharness"
-  ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "630393ca7b7c8d068bc663f5d02a320feb5e1f2b",
-   "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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "3f0455561a7cc68805855a198a064c113d7e34cd",
-   "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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "fe7d67eac06ea36525e7b2d7d28a3253964a1ae2",
-   "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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "5b7d1de44cc3a09201e37e345f71499302d6179d",
-   "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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "2f6692c42930b568c7862dd5535c0832d0bb2e0a",
-   "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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "baf2fe784407fb8e1f32fefc8735b0a90ae77367",
-   "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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "e6de3ee6078627f082db8f720bd4ba880215d5ae",
-   "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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "eb1c0191a3bee7f8397e35181eda73fece70459b",
-   "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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "911649a5d14a91e50d73446f93ecd407fca79642",
-   "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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "08c297eae3be1e54e4a4801bdbfb12d5e7475a22",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "89532a53691ecf311dc1d91e4ec95b02f92d9932",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "7ba2e047912035f0455dda6e854cbf40befb131f",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "4c4ea0c52d51fd6475a72bf8738511f33ba84883",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "e47bca42c765f858671353650023afdf9ce763fc",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "77c266d21e2f8c408b265f0ca819f0bb4ca2e11a",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "ffc0a2ee559cb7d488c14608a436be1a9f7447ff",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "288fa038a4f41cd64567fb356a3cb88aa52f3f35",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "88ab886b2338d25ee790434fc25d8be68e13cbf8",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "24ab142cfd7c61ad1dde43544e04c3ba83d1b614",
-   "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/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "d486a7b8569bf5597aea470d5ec0a88507ad5f4f",
-   "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/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "fe1ec67414d5148d1fdc4578132624ec4e79be3a",
-   "testharness"
-  ],
-  "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/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "d36ac614868ed5876dfd83d7d7f1baded7be7593",
-   "testharness"
-  ],
-  "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/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "f4db0be0e50a3e66d7eadb2b1eaeff2fa1072509",
-   "testharness"
-  ],
-  "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/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "e9125ad06822298506b35dda16d51f1273c3d03f",
-   "testharness"
-  ],
-  "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/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/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "ef7dfd49fe4b8a0ed379cc1b8818d482c8d81b1a",
-   "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/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "bfae1b4ce35cd823606a7f5fc14fc0112a53b8b7",
-   "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/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "9fa4ca3c127760d4889756e89839e65ae0a66d34",
-   "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/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "c9d64acd3ff519673914c0a921d1d4c6730d4ab4",
-   "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/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "b44acdd3f3bd62b513b1d41267e2810476ec65db",
-   "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/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "a709e40c51bed38738d5fe4546688fd20095464d",
-   "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/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "be879a223147a9f9824f63665aea3b7614be1516",
-   "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/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "ef0836b8e8759325d50c23bcc206b5fe974e2593",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "86f6a004c32706f57518b11600e41212876de0c6",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "c404fcf03f9e76a1408f2387b338d9c6335333a7",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "f3f701fd230d672c61772c7054201569a1f59173",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "2ea65da273ee14f51844c0ff2cd82d814e0d9901",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "90a500cfae7b89c2a8541b58e8ce0804d0ab4718",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "79c96e6f2b418a2bd7b07009a0b7d9270b2d8198",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "714a08bc7bd4da9ff1812fd31768613d99df042d",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "ff7e409b8d98db62ff9f3c442509d66f0e7919ac",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "6e914683ee821997b67dee5cc1c0daf52986af15",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "1a8ab2b48306295d1b8f3eb87d8dfbc50f0b7358",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "4f8dadde3c41e15e568b9a6321e57b9cdfbdfe76",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "8f130d28a17578f82edb8543e17aa4b045289b8d",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "75eadba3d1efa74cdc8c978f997963481e2b59f9",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "4fe3af9ffd3bb4b077f3c65e7f1f8817cce4685d",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "48631e39d2622d7d3e3133314c761790bdc00957",
-   "testharness"
-  ],
-  "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/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "2d2ef35f6812f46c99af481956c3292dc69f12b4",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "47c51d9df663b03012695da3516a02e6ab0695c5",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "330d3f0f907d853eb503531137c7deecf4a05b6f",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "ea15eec31891a4328f5cebf1d47df7d42f151a38",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "61323de7a029a42918dffd54dd6590fcdf4d2d8f",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "c59ee9d340c69148e2bdb886d4d52abae1f8f99a",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "51b9ba265647a4b6dabe21e112721d0dce0ce7e6",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "72e74ac6802a9cf6de29353dcde4dea78c65ddee",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "39c651732647ee15c47c8f32c7258442bae8370d",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "9af146296a2a51b9c76b3267c93a89c22f4bc3b1",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "4000dd3467dbccd3d31826653b47ad01ff54e37a",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "547c19ff4852446c7766e2e7229939ad02ba0284",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "ec64d6fff5a3033dbad357fc7b16a377907a0311",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "2623fe82db01c67d5339d87afb0340e9e5b8af89",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "adce8bdb5693cf9164c801b358c971adf44ae33e",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "fbfb700eb942f4f81b60865acc65a95b76d24a15",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "68a33b74a18b0d22299f590b925c9485c883b453",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "40e7caed48554bee235dd35989bd1f606dbf33d0",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "7992aa6e009b7eae992387bebbdfe9fd04cdbf76",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "9c4011d2817e6fa18ad45b98b4cf60dbe862b48c",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "b174ef4feca3b4ba3edecdef4b5977f9f81e4783",
-   "testharness"
-  ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "6d987fbcb5253f051dc4d3e2999a442fcfcfc56a",
-   "testharness"
-  ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "9fa486e6ef1b9cad07b3c8574951a506b77c39a2",
-   "testharness"
-  ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "40606039bedef1fe8d51e73c3591c805d9542caa",
-   "testharness"
-  ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "669b174a081ddf8a9a343731ed95a3a0304af16e",
-   "testharness"
-  ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "ed249742bfda996c31ee78498720021f586daf60",
-   "testharness"
-  ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "8a7ede0d2ddabaab705f9bc147e884fff273e98b",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "1a5ad9592d5fd28fdbfd06bd2067e58b9c6b4fa7",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "0ada60ada7117218c2211447c60a525bf33f0ca7",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "1737905526006bffb455575ebfe0e8bec7167529",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "60094d7f0abe1838bf39a4f720b77f0f94888a21",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "483a43cddb138648c2df46f4eb5ab6586c4b8333",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "f27831c876c8aa33b2d56b6b39e5d7ab12c2fe43",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "44042cd5008283236daf1483253fd8576c3c17f3",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "7599f2ff24317f5f4f29cdf28684db78a1cc1553",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "f2a25196f712cc72458b8df5a22878fe6aab7e88",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "79c61faa4175c79013ec81332d4916f69b9438a0",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "3c2117ec0223436fd7fb76000f83ffca1999159c",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "f3608e17eb9e9b4e00e97af35ecb5a2d27b8a68e",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "bde05c454fdc270c6c58b9b26d61c96dd12f08cb",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "7d723ab86a122870119fc6e46fbe8d6d64a1992d",
-   "testharness"
-  ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "e04b8253413a606b5913c532ac9c3934188310cf",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "7bcc2189a06b278e172ef18e25f2eb77a9080976",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "052a9df8e718bc7f5b1a536b542afeb9e77d2d1f",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "92b1559f77a34faf3d2e27c3dbc9139bf6ac7594",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "c047ae9b3d2391726700ede6082f3290ede16268",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "a1e4d2d8adcdf6ce31d723674acb59768c59b6b1",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "7a1fd76a93063b164e697d47a35d20c624d748bf",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "9b7cf05f66e8942ea379a7bd1af05708db5ac555",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "6c6bf43a24da351d73249c4938cf1022a3f058b6",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "adbecffb5055ad8b9601fb43131ff2ca18c3c41f",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "a0942713fda3f86974fed9cfb2e0ae32f985b0eb",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "b37889b65b81ba6c2f236eab1f7a52764111298f",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "dad6e7ec9af0b8026a449559e4eb102f030d7afb",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "0e379e4312314b6ac9033b6077f3d8bbc92a6c04",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "1f7a8985a9eaf9c63aefbc1a94eb77692dc33af7",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2cbb6fd3489a6fb1610d396d1cd84b6cd39b5e3c",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "289aa3faacd62c4a5b7664224f239a77ea217852",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "eaa417eca087df663bd992d9fa5681f3c725ecb1",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2d2c6d6d04bb77176f33a658f02d83931181bc1f",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "7e99eba7a8c0de14a5319861eb19e4bf051e5ff0",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "a294cba7c53bd8b21f22bcf72265ca21735e652e",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "0f0f3f586c7061c81392fdbfbb0614a9a564c7d9",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "29598521aae474ad8e0249e77f8c5ef35e122954",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "03618c360eb2ea6a16bdd000f81352ac06f4f8df",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "1e785d961ab5f83fa3cdaf6bb1d8096599e4c848",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "4e046873b80698f0686963ffd19a4a5df3063677",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "c61e82351abae662c02d9f815581ef965395de0b",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "96fc319aeeb771d19f522f2056cc07424fa0de56",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "1e54e3910e47c0519b5d9300187ca6bfeebe42e2",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "a67da15008442cdfdddc04b50b85fa45eda5ee2d",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "b5c0081ef670b30fab9000c250f5747155867d4a",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "9aeeff94ea29d6e9e3f4831f2e5ed2dd5b31cb05",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "0b75d68887554411a66fd7a729fac2a6fbc34b20",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "2be11cbd75b1c632d25aef91215d435d53a775a6",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "5923bd66f218c216f82ec0c8686e4063d6dee687",
-   "testharness"
-  ],
-  "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/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/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/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "b3424b1ea90df159ac4357acdf1912aa7836db10",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "40c2b7a9ff80538e4597efcfe68206419d4550cf",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "13b9d94f53e651983f0c98f1368712ac686f8b94",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "b50c0b60db869878263019cd538f40b5c91be652",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2ae690c53d97c27f587fd4c7a2fc3fe959865e97",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "b14908a7b2cb7fc4271cbe54566f074053e84ea0",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "485c8784c699bc4b8c93cb38a818965b1ff0e1e4",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "6f2de0eeff1a23b74ddc877eb405ffc125b62220",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "f6a28d48c1c87bada3f91f60d64d46b5874ef751",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "a38fcd1affaa899d1df49f5fef443ac3679a04af",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "9ac2ca34857a77a6729ccb2aae308e72c339deae",
-   "testharness"
-  ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "f0d6cdbf00c720d54d10495703455a1efccb3e1f",
-   "testharness"
-  ],
   "referrer-policy/spec.src.json": [
    "ab02dcc1b16e0621ef241b375654a3cd41345e31",
    "support"
@@ -672849,854 +675745,6 @@
    "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "d3ee7cb684b1e59ff32a101ad3034c2f9ecd53b7",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "f09d000eb723a6166ee5bf85a3e93f771813b042",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "948bb08791912b5ab811ca34da60a997c4e45cb0",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "990f752a23d090d7393b2a676c23ff7710496efb",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "8e23ad41dedb44702abceba00b31d5a720b19767",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e5c060c86b3b673d7c9e5360bff394013c7a0267",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e165003f6eabbdc0de301971e3f04743e5eb876f",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "984b0790d4254ea9c18fdb5eed37bd5b436d05a3",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "cd8c557f05dca5eae753516200ab2c18ec2fba61",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b38e3d4668b89e961ff4b4d6faef3fe568de4c3b",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "83b3601256f6598d4ecd45da954406b7c8363757",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "b56aa7a2c44f5a81ed4f0070c931e7141f620b35",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "6087f4b7db9ee86274233ed54c17d812932eedbc",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "6581ee64e4ab670f5eeab7cf70e294872f823985",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "5345da2d6d45f40c793760d90aa5d1c4cda84b37",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "382334bba5cccf71d99e6abbbec51ed8e874270a",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "db04cf7f5cc7620372daa6d0a9c86a6d1dcdcbff",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "1a6e2a4aeb304f4ca897598060bdbb87bb270a95",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "bfd21f6f15f12bfe1123e2d44c699b9611097641",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b9d2ab53f9a22f4b2add660ca90793c81ef47c86",
-   "testharness"
-  ],
-  "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/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/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/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/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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "6f0993c801077a16480913be20c0375af1eb9eb8",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "1a928cfec18993f7e92e5d9d500fa595e9ca4248",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3e11ade1bcf49632358cb1369706410b127b0326",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f28e884825ec8151381ea7096a08ee0b9970d1c0",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "9acebe2f0b09702c5f00103067bc748e9f4b5744",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "a205d415fa384d246f497656e6bce1cfa161368e",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "4b94af4929c8b30586ba2b477233e7e493103b4b",
-   "testharness"
-  ],
-  "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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "17f127f60366df1597b5187241a7e7437172152e",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "2fb347ef35b8ecc2206f272db95156cdb9a0e771",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "0c34da119fcb3634866a7fe153256c3c92fcfa3f",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "f992e3939256b8eb977231539bed90323c4b3ccd",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e1e6c13ea358c7f8f0178a37a30505271bb2b446",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "fc07b47fd6408b74c6767dbfc385adf699844614",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "083891dc3c131fb56f8d5372ca206b597c6cae71",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "07601e37eb0bc39eb87bc3c8901d27bf6792f61f",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "811265f11cecd9ca5e83c8ac4c51bd1f29c14d1a",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "254a29152f87e95359fffd4749b2c625d379c3d3",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "f78fb878fffa6e52bd41177b219b019cb03bd482",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "9c5035945c9081f4527343ba6df6372050def682",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "4b238c0449d93ae792be3d56fd2d3640b28ef8d2",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "a860c257fd7cf4566bc988827416c09dfde21392",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a798c85d6f54988404b28b9afb0017dac6e8bcc3",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3955b78f7ac922c6e05c118dd0c1c99aa675c56f",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "f755d35c825441c134ad8b567f9283c1037a970b",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "240a3c7f186c06a8271ed65e4bb9a868cf24f92b",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8d18e84cb76041841df3ca418d8c63f023c38424",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "38edd1b85df4ba87ddac07869eac39e9123d9a99",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "95f4a17a2a762a1dbdd65b5a6c85899923269d6c",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "f80ba3759587e78087833d49cc28922a3020b9f6",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "ed1b8c033be379b88933ea8c070194a9d0464ade",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "050eb6a3904a4dbfcbaa5bff5c4b7a04c5cee3f7",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "143f3f7c87a289c9dc0c673dacbbc537b43f3a36",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "ffc8190298064e81a4c3bc0ef0c3627cc83375a8",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "5d8be2bd928046bc40f74a14484e1bbd2f608ae8",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "7ceb389b35b5e21b63fedd186ca8583d5c7c66ff",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "f3f5573b7582ec9cce17345415f2df932a829451",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "55edfc9376002b493f8a271fc7a5d62c27748802",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "902fa3341a1812c19d8091055333bee7993745a3",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "bd278695088c2cfdd5d028903cfe94f216d8114b",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "331f865afb25e0066d4fa4861126931693eb0404",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "b26af2a076cdfdab3c761264efdb65452f32b7c1",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0d7bdf20697948d118f95f71f69bae85e02151f6",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1360edbceff54f3bfa446af531db26a377ca007c",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "2f99fa632176959bf717ef2a4eb6e3851c99d264",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f69c1341e0992a2fc3f1306c5cc3c795395e550f",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e7ea376cd142a551f3178e35389c9f28e83224a4",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "859c7267ad547066506e11518ddfac7ebcf16b1e",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "747c8e1059db4aeadb3d99fa855619e522d8b225",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "9aa77a78c63ae46e9fc13923c66f3d77c1b8e7c3",
-   "testharness"
-  ],
-  "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/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/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/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/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "0fc489100e8d6d74055f7e91e7eca68ffc8318bf",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "0028b48d0b7e97f404b3c532864d01671d709286",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "8b2dea1cb62f4d5fd0dfdbe22617e9a9997a4046",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "c43e52e9dfb1b4301b6d275836c44aa5af0dbb8e",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "41025c58578ab4aad59c0173077e560d0269f193",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "ada714dcc5088fd580daf2b5cc12e5a71233d7a7",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a574b1304117a6caeea002855820764dbbca9d45",
-   "testharness"
-  ],
-  "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/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "623f6a6e81aa33df2fb6d12a7df7bcb353c91c99",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "0e40587a04020bb8526448e5649b5ff179b612c2",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "7c597fbcec5ff35babb6219d5a22be50857cbee4",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "7ba85fb790c517f3223183557921082709f6c38c",
-   "testharness"
-  ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "fe6b2b59b8b58304d4815fc6340b099e9177872c",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "00587b4f18a6afa814740c3148d671600e243089",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "3bcc6e82a70198f0c397cf2968feda346dda175d",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "387a0b3e6d5d9412f4c00139675f6c6937a7d59b",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "e19734a542ae759c235549e55badf0fb64a8da11",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "72eef24fef5e9131501a0959a1088053fbc6e278",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "c789cf6d302b2e1acdee5cad196950f7f603037d",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "a24af8beb2dbb79316b79e07e9184c14e99c3328",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "a2773bfb160e4e998c5ea08e28c9824f151df2ad",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "72cedc5e35c5c1a6c0eed922de72b743276b5850",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "612d7b36280cdec928734d007dd7d853a52cf5eb",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "dca3d06299409aa44d3a8fe98b82875c7702754d",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "2c5328ff25e68f4c362dee910453e7ec7323f010",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "54dab293d80e500094aebe896ffed492dfefa96e",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "9899e2f4e6b7ebb7b9b8d1afc7266ed50384150c",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "98a55358c7e8056157192bd994daeb8c95917f9b",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "d5843c83a955cb9a14621405ec77fd8620aba947",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "f7d63a639ef29924cbdbab9f6f173365f2f0ec7b",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "bcf8f70bbf774bf7240314da1fdcd8d24c059782",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "eca04d52b0274beed7eed501809302e08c2ea166",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "91d7ac0ab4d93b9445de7382c8ea0a7958ace19d",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "72eed78e5a241f9f6548f55812e8335fa723d784",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "7a45e12f4f8facecbf19ccc1b9735e04ba5f4ac8",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "5facb852896e54c8c399d47b72dc7a914e576ea5",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "8ed4f6340056660fd25a65396d69504d4c314601",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "70403fe53654d6a931f70fa05cf441e2cc574c8f",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "32dacf7ffdcd6994549e01d73bf5db33a51f72d2",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "433f51b14312f8de24d1c81041330a9f3dfb894c",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "b23ffd4b8e2ca1ccb78229d9f96a20c47b288ce4",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "08f7d0928944cff07ec99f6133f2b2b8bfc058b9",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "f5bec43c8b225ba84858532dce2336d7c09d6854",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "c1d52ddb51465285fd9b8d4099f3add98930ad47",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "5225f28f85073b1733fe5f895dbce696ca2fd4dc",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "e17dbf9ef6a512a37a93a0795686da06b0111ecc",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "613eac440b5089f3375c9b1f542115d75ef34ba6",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "dfc5328013a50d133a51e8036cecf782f7460840",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "ea9605e8169f523a8ceb8bcb107aec2a4147888a",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "8b5e5cd9c0c39cf22d18ae05170c66e42afdfa43",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "0913d31a24f697fb415b9f3613689313672cd9e5",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "2b06a9ab2a2c2137c8e5dff00176abb96c3f9923",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "d8375c93426751069de86076316f9d9eba38e89c",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "3353f70740458abee966085e45f14bc359db7e97",
-   "testharness"
-  ],
-  "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/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/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/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/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "cc71a6ca6896b0ed81f30adb0d0c1408631915eb",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "18fa571fbf2d6b44cf6ff96096a5cc9bc6df8bf5",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "bbfd11f31feff89a66282043d560743696219b77",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "7b81605b86fcc1cd058c34446d2b92f0ff29d09d",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "6a28a4c5e54771ec5a16a0034f6b2d26eed28592",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "5c47aac9269384079e3d6b2f922e9ce25582aa1e",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "c5367f0e3cb11180719119d78b45a590e35ba3be",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "cc66c5cacd183b3be962f7c0b0ee09c57e80f01f",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "07314409e95ce6c648bb02dff11bca5cc7d9a40a",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "c6aafb2d30694b446d4c7f9c540f43218a13616a",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "3e27d0de2aaceb936883489d2d79513c78ea227b",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "82055a7d4a265bdaaf5fd5f3b17da7710cbfee87",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "a94a77be5677dcec6895b81e2227cd747208b159",
-   "testharness"
-  ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "289d7ee4ee55e8def5deeff5bfd9858a8db504e4",
-   "testharness"
-  ],
-  "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/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "f22c4142335834d6dd4cf8f59d7604491a8615cd",
-   "testharness"
-  ],
-  "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/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "155e9fb7bf2f9c867dfa38e43a09ae522a174ac1",
-   "testharness"
-  ],
-  "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/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "989c847a5b903f6611db7a66418f7071a9cb8508",
-   "testharness"
-  ],
-  "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/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "96f5f8c07a1d0b4172c9ee7e30d8254c4b108591",
-   "testharness"
-  ],
-  "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/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "c9b99a6b84184e1edfc8590311770c5d9466e921",
-   "testharness"
-  ],
-  "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/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "7f14e55c1314658193e256b21651129be80de31f",
-   "testharness"
-  ],
-  "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-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": [
    "c23f3bd9b8f812b9bc554a2fa35764c300d1c896",
    "support"
@@ -674497,6 +676545,10 @@
    "d74ad97a281d90f0573924ed42af7c9f299fb30a",
    "support"
   ],
+  "resources/chromium/sms_mock.js": [
+   "a8cd81a5ceffc29ab1f4c6ea20d2771793f42d69",
+   "support"
+  ],
   "resources/chromium/string16.mojom.js": [
    "25377e66571b145907a490d17c673a5abd023171",
    "support"
@@ -676730,7 +678782,7 @@
    "manual"
   ],
   "service-workers/service-worker/fetch-event-within-sw.https.html": [
-   "c73abc4c98c0871e3021e6605311ba4b1d7a889b",
+   "8a567fd7a93f8552412cfff657789c5375eba971",
    "testharness"
   ],
   "service-workers/service-worker/fetch-event.https.html": [
@@ -679726,21 +681778,21 @@
    "testharness"
   ],
   "sms/interceptor.https.html": [
-   "39b749b6d32c32a3254043067deb4dc695a0ad4d",
+   "6da2d71c52a90f7d0906ea99397976cb6e1573e3",
    "testharness"
   ],
+  "sms/resources/helper.js": [
+   "d34d6db3a2e6c1a744a4193939251dc382691061",
+   "support"
+  ],
   "sms/resources/iframe.html": [
-   "9a00e84c63b9321d9e29c10aeb266ff5c0b1d5e1",
+   "38efb15a748504a455cb5388e5b901392fd695d4",
    "support"
   ],
-  "sms/sms-top-level-frame-only.https.html": [
-   "ba6374e85b38f7add71938edffc2e74c9c013259",
+  "sms/sms-iframe.https.html": [
+   "0809f2426d96e5be288853a678695fe807cf6b14",
    "testharness"
   ],
-  "sms/sms_provider.js": [
-   "11fd8466e986bd9e723791ea6d06f507a17e1247",
-   "support"
-  ],
   "sms/sms_receiver.idl": [
    "64048523f901f8509e85e4dc1ddc1f7c59ab3489",
    "support"
@@ -680633,6 +682685,10 @@
    "aa1cb8c983d482439fccc6d91b50e69585f4d404",
    "testharness"
   ],
+  "svg/animations/beginevents-1.html": [
+   "92debaf82a85f972c605fad3dd7a15daae26a912",
+   "testharness"
+  ],
   "svg/animations/change-css-property-while-animating-fill-freeze.html": [
    "6774c3475a681f9fc91e8280ded739e9e65f4606",
    "testharness"
@@ -685242,7 +687298,7 @@
    "support"
   ],
   "tools/ci/run_tc.py": [
-   "240517a1ff68ba072cc48f31bf42ed8c9d888048",
+   "e54f431955a55fd4bc70fed0952be8d260e93478",
    "support"
   ],
   "tools/ci/taskcluster-run.py": [
@@ -685282,7 +687338,7 @@
    "support"
   ],
   "tools/docker/Dockerfile": [
-   "e60b4ea6a3a1c909c715fb7248a6f1b0cc6e9d4e",
+   "3d41834cfb41430b4a9aa05fa8c6d6b6f2010b51",
    "support"
   ],
   "tools/docker/__init__.py": [
@@ -685310,7 +687366,7 @@
    "support"
   ],
   "tools/docker/start.sh": [
-   "dbeeed41c149398cb12202a9e10b71e745d06d90",
+   "2e5f69d40710f7fa6dfd17be0951b3de1ffdbf60",
    "support"
   ],
   "tools/gitignore/__init__.py": [
@@ -686018,7 +688074,7 @@
    "support"
   ],
   "tools/runner/runner.css": [
-   "85460177ea151abd3eefa84986607755c92efe93",
+   "ec72acb83e70b5fa0dfe46e92f7059d5f57e54d8",
    "support"
   ],
   "tools/runner/runner.js": [
@@ -689933,6 +691989,10 @@
    "43e7426dea1241bbd371d2f24f63f510427a519f",
    "support"
   ],
+  "tools/third_party/tooltool/tooltool.py": [
+   "53929fce880285629ebf6f243d7bea86036b16d0",
+   "support"
+  ],
   "tools/third_party/webencodings/PKG-INFO": [
    "2a827bbad923f7eebdc37f09c790e70228865ee6",
    "support"
@@ -690025,12 +692085,16 @@
    "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
    "support"
   ],
+  "tools/wpt/android.py": [
+   "f92146c75e4377683c3b65b85ee5c201948b6f83",
+   "support"
+  ],
   "tools/wpt/browser.py": [
-   "b905379c75442cd1421c7b300f2c132bda462721",
+   "ca86c55d45f065b7a8ac0c047dbb22f2edc9414f",
    "support"
   ],
   "tools/wpt/commands.json": [
-   "da8804d0607b2ead0bb83e1a38b9633ba7d657f9",
+   "178eda9c2656c393132792c2206489ee95a6a362",
    "support"
   ],
   "tools/wpt/create.py": [
@@ -690041,6 +692105,10 @@
    "8215dfe09161ad49ba3975e1eacc927c61715acf",
    "support"
   ],
+  "tools/wpt/mach-emulator.manifest": [
+   "49f46c60ffe1982e52ae992981be9c8203d35a9b",
+   "support"
+  ],
   "tools/wpt/markdown.py": [
    "43020cdafe6e336102acf4986bf3ac1a6b25de0d",
    "support"
@@ -690054,7 +692122,7 @@
    "support"
   ],
   "tools/wpt/run.py": [
-   "181d6bfdea9b6ba630f672cbe7bd5e5a4ab41fc5",
+   "0bccc687b7c044648d1270fff0def31d3f5a8796",
    "support"
   ],
   "tools/wpt/testfiles.py": [
@@ -690070,7 +692138,7 @@
    "support"
   ],
   "tools/wpt/tests/test_run.py": [
-   "bc43e647c31ab7023461e6ed83329a4ae76ca6f9",
+   "ef58ec41b2b4cfc14955b701627d047af78f29bc",
    "support"
   ],
   "tools/wpt/tests/test_testfiles.py": [
@@ -690182,7 +692250,7 @@
    "support"
   ],
   "tools/wptrunner/requirements_firefox.txt": [
-   "78e53e60d94e3267f7f91b0cf6f2f65b6a35fcdc",
+   "a0826aede8bb4a0477ca4fc20d3d738f0ef80f8e",
    "support"
   ],
   "tools/wptrunner/requirements_ie.txt": [
@@ -690698,7 +692766,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/wptlogging.py": [
-   "2070f77591dd7ba2dc9690e5f06809299a9eeb50",
+   "6751f8907f411de8ee2b8999b86a1ab1cd9ee57b",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptmanifest/__init__.py": [
@@ -690758,7 +692826,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/wptrunner.py": [
-   "bbe9b56f6752245be1217a1cde0ff357428b0294",
+   "6b4e70b30468618f71378c3be7c4779d79dbe6c1",
    "support"
   ],
   "tools/wptrunner/wptrunner/wpttest.py": [
@@ -691230,7 +693298,7 @@
    "testharness"
   ],
   "trusted-types/TrustedTypePolicy-createXXX.tentative.html": [
-   "475a264790482aedf714958f63a4d47d69661941",
+   "a078af4b36bf295c1c3bc5814631e79779a3c73e",
    "testharness"
   ],
   "trusted-types/TrustedTypePolicy-name.tentative.html": [
@@ -691242,7 +693310,7 @@
    "testharness"
   ],
   "trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html": [
-   "37e245ee27aa5828bd97568d9390d9cbfbb6f968",
+   "8cdc837cba83ef6fa609556f4be453cdca1fc0a0",
    "testharness"
   ],
   "trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-noNamesGiven.tentative.html": [
@@ -691353,6 +693421,22 @@
    "a6aa061f7307330e027c3e8b26e6b931cee2bb7c",
    "testharness"
   ],
+  "trusted-types/default-policy-report-only.tentative.html": [
+   "aa13e4252c4cbcd7c26d62e52b04e9dbe90773db",
+   "testharness"
+  ],
+  "trusted-types/default-policy-report-only.tentative.html.headers": [
+   "fa87952ae486b3a902eca0257eadace8e25e881f",
+   "support"
+  ],
+  "trusted-types/default-policy.tentative.html": [
+   "aa13e4252c4cbcd7c26d62e52b04e9dbe90773db",
+   "testharness"
+  ],
+  "trusted-types/default-policy.tentative.html.headers": [
+   "1bc33add09b4b34ce2cba21f488f8ed53345a27a",
+   "support"
+  ],
   "trusted-types/eval-with-permissive-csp.tentative.html": [
    "25b4948c039c68c425e22f5e30ae4338327b6ce2",
    "testharness"
@@ -694142,7 +696226,7 @@
    "testharness"
   ],
   "web-nfc/NDEFRecord_constructor.https.html": [
-   "4d6ec956eacfe08eb01d244a4b2b77fc7277f428",
+   "9ce41a403217439ed19d46a33a554ff449630bac",
    "testharness"
   ],
   "web-nfc/NFCErrorEvent_constructor.https.html": [
@@ -694150,7 +696234,7 @@
    "testharness"
   ],
   "web-nfc/NFCReader.https.html": [
-   "6fcb9b161dd127e1f6e5a3e3e9fb77c35b18d657",
+   "448f2c74f5ca307c6afcfffa28cd1f1c66b6bfe5",
    "testharness"
   ],
   "web-nfc/NFCReader_options.https.html": [
@@ -694162,7 +696246,7 @@
    "testharness"
   ],
   "web-nfc/NFCWriter_push.https.html": [
-   "33471a18d8e1f960bbf6ad06b412515f5a0ba87e",
+   "dcd23307a2e4bab5677d07f6780fd6a339bc463e",
    "testharness"
   ],
   "web-nfc/README.md": [
@@ -694178,7 +696262,7 @@
    "testharness"
   ],
   "web-nfc/resources/nfc-helpers.js": [
-   "f7ee7a4786eef391ec8025560c9b4718f23cef68",
+   "bffe10f80227fe0a7259fa975412a37e506fabd1",
    "support"
   ],
   "web-share/META.yml": [
@@ -694202,7 +696286,7 @@
    "testharness"
   ],
   "web-share/resources/manual-helper.js": [
-   "e2ca229f4f9b229cfad9f84bed8b71ef96cb98d1",
+   "15bb17936e4479f7338b7cefbaa87522a2a02df4",
    "support"
   ],
   "web-share/share-cancel-manual.html": [
@@ -702262,7 +704346,7 @@
    "testharness"
   ],
   "webxr/webxr-supported-by-feature-policy.html": [
-   "6d0531055c585fd3979a785b01fafdc748f4c6d0",
+   "d1f8252977f7aa1b87e4139c640ae6788db607ae",
    "testharness"
   ],
   "webxr/webxr_availability.http.sub.html": [
@@ -704649,7 +706733,7 @@
    "0ffd8877f87f9255668409c1fc9e973d006e6ae9",
    "testharness"
   ],
-  "xhr/abort-after-stop.any.js": [
+  "xhr/abort-after-stop.window.js": [
    "a254648f419242f4939b4561e7720c6085f13b4c",
    "testharness"
   ],
diff --git a/tests/wpt/metadata/css/css-flexbox/percentage-heights-003.html.ini b/tests/wpt/metadata/css/css-flexbox/percentage-heights-003.html.ini
index 90f967d5c79..1291e66cabd 100644
--- a/tests/wpt/metadata/css/css-flexbox/percentage-heights-003.html.ini
+++ b/tests/wpt/metadata/css/css-flexbox/percentage-heights-003.html.ini
@@ -5,3 +5,9 @@
   [.flexbox 2]
     expected: FAIL
 
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini
new file mode 100644
index 00000000000..d3f46c22377
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini
@@ -0,0 +1,2 @@
+[contenttype_html.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini
new file mode 100644
index 00000000000..c3916f8555d
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini
@@ -0,0 +1,2 @@
+[contenttype_txt.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini
new file mode 100644
index 00000000000..cde6fe16ee2
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini
@@ -0,0 +1,2 @@
+[contenttype_xml.html]
+  expected: CRASH
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 62c36a4da9a..c5e7dd9675d 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,27 +312,3 @@
   [<iframe>: separate response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*]
-    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 2003288747e..d2df9b78483 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,9 +56,3 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [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 ef3edb78985..d4ba399b762 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
+  [X-Content-Type-Options%3A%20'NosniFF']
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/sec-metadata/appcache.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/sec-metadata/appcache.tentative.https.sub.html.ini
new file mode 100644
index 00000000000..6fb669844e1
--- /dev/null
+++ b/tests/wpt/metadata/fetch/sec-metadata/appcache.tentative.https.sub.html.ini
@@ -0,0 +1,4 @@
+[appcache.tentative.https.sub.html]
+  [Appcache!]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.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
new file mode 100644
index 00000000000..16fa2c5cfc1
--- /dev/null
+++ 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
@@ -0,0 +1,4 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini
index bf50d59df41..e02f179ec25 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-innerwidth-innerheight.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-innerwidth-innerheight.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for legacy `innerwidth`, `innerheight`]
     expected: FAIL
 
+  [features "innerheight=-404.5" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=-404.5" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=-404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=-404e1" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=-404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=-404e1" should NOT set "width=404"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
index d1ed9088b2b..9027336b453 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-width-height.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for `width`, `height`]
     expected: FAIL
 
+  [features "height=-404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=-404e1" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=-404.5" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "width=-404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=-404e1" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=-404.5" should NOT set "width=404"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
index a70e9dbad4d..4e44584b123 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
@@ -1,32 +1,48 @@
 [open-features-non-integer-height.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `height`]
     expected: FAIL
 
   [features "height=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "height=/404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [top=0,left=0,width=401,: absence of feature "height" should be treated same as "height=0"]
+    expected: TIMEOUT
+
+  [top=0,left=0: absence of feature "height" should be treated same as "height=0"]
+    expected: TIMEOUT
+
+  [features "height=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=L404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
index 779531b4a98..fcaeae5336d 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-innerheight.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `innerheight`]
     expected: FAIL
 
   [features "innerheight=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "innerheight=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=L404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=/404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
index caba4124f0b..a8e4fe06618 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-left.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `left`]
     expected: FAIL
 
   [features "left=105e1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105  " should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105/5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105e-1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105^4" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105LLl" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105.32" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105*3" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105.5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "left=L104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "left=/104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "left=_104" should NOT set "left=104"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
index 9ace8a4cbdb..64a08faf0e6 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-screenx.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `screenx`]
     expected: FAIL
 
   [features "screenx=105.5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105e1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105  " should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105*3" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105e-1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105^4" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105LLl" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105/5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105.32" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "screenx=_104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "screenx=L104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "screenx=/104" should NOT set "left=104"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
index a82bd0f981a..4f22ef4ef29 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-screeny.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `screeny`]
     expected: FAIL
 
   [features "screeny=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "screeny=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "screeny=L404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "screeny=/404" should NOT set "height=404"]
+    expected: TIMEOUT
 
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
deleted file mode 100644
index b5a27414b21..00000000000
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[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/form-submission-0/form-submission-algorithm.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
index 127392316de..702af61a3c4 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,7 +1,11 @@
 [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/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
deleted file mode 100644
index 9e522297c94..00000000000
--- a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[toggleEvent.html]
-  [Calling open twice on 'details' fires only one toggle event]
-    expected: FAIL
-
-  [Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
index 496bad988c6..034d9baebfa 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
@@ -1,4 +1,5 @@
 [promise-rejection-events.html]
+  expected: TIMEOUT
   [delayed handling: delaying handling rejected promise created from createImageBitmap will cause both events to fire]
     expected: FAIL
 
@@ -8,3 +9,6 @@
   [no unhandledrejection/rejectionhandled: rejection handler attached synchronously to a promise created from createImageBitmap]
     expected: FAIL
 
+  [rejectionhandled is dispatched from a queued task, and not immediately]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5966847cd68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag 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/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..138c8dca802
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect 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/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c4171db3779
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect 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/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ef804b83897
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to cross-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/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b19ef3e3d49
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-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 script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6aaebe4910c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-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 script-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/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..bba3879bff5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects stripped-referrer for script-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
+
+  [`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/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6426ad898ee
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for script-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
+
+  [`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/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..26e109e6785
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-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
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..f2f8f911fd1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-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 script-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/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2cf1aac9f5c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag 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/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..049768073e3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-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
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..797e9867d5e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to same-https 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/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..46e12c5828f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect 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/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..cfaafbfe470
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-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 script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..f521c697255
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..63c4a5cafa1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..17d2501b43b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..8f56ff659fc
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..a554718eae1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ee3ac6e0557
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ce0aee6fe58
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..91e10e045fb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..7d733d9d097
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c4b8d30ef7d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..98781a1a5f7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e05d73cdbfe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..cc5bc6aa788
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..0e995b4ec90
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f4cc5b8dd7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..85703f47333
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9c6c302af6e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e1184cb4587
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c2bbc084457
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..4ea0a1767df
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..fde555f18ed
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..bb921a4c12f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6a3e491929d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..49b2023b8a6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c6668d8956d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09c2b789102
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..a8a249cd2fe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e75f3a38a79
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ebf5e484ba1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2a30f882424
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..561fd9d85cb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c52b50be127
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..333026ae837
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..5b98de0274c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..66d00d328e3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..4e16abb0012
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..46eb0c9e9ab
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b410b802293
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..47c858a649a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1ca628c2908
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..f2f8f911fd1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-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 script-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/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2cf1aac9f5c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag 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/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..666ff1a73de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d6c4b9d088a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..43c2d41da6e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..7519f8a3298
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b406f5fa517
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c6668d8956d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09c2b789102
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..a8a249cd2fe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e75f3a38a79
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ebf5e484ba1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2a30f882424
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..46ddcc9e46a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..274effb301e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..561fd9d85cb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c52b50be127
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..333026ae837
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..5b98de0274c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/origin/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..66d00d328e3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..4e16abb0012
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..46eb0c9e9ab
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b410b802293
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..47c858a649a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1ca628c2908
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b047410ca0c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..bef221948b7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..666ff1a73de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d6c4b9d088a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..43c2d41da6e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..7519f8a3298
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/same-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..f2f8f911fd1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/script-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 script-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/req.attr/same-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2cf1aac9f5c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/same-origin/script-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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag 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/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c6668d8956d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09c2b789102
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..a8a249cd2fe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e75f3a38a79
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ebf5e484ba1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2a30f882424
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..561fd9d85cb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c52b50be127
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..333026ae837
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..5b98de0274c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..66d00d328e3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..4e16abb0012
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..46eb0c9e9ab
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b410b802293
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..47c858a649a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1ca628c2908
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..f2f8f911fd1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-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 script-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/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2cf1aac9f5c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag 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/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..666ff1a73de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d6c4b9d088a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..43c2d41da6e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..7519f8a3298
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b406f5fa517
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c6668d8956d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09c2b789102
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..a8a249cd2fe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e75f3a38a79
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ebf5e484ba1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2a30f882424
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..46ddcc9e46a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..274effb301e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..561fd9d85cb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c52b50be127
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..333026ae837
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..5b98de0274c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..66d00d328e3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..4e16abb0012
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..46eb0c9e9ab
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b410b802293
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..47c858a649a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1ca628c2908
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b047410ca0c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..bef221948b7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..666ff1a73de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d6c4b9d088a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..43c2d41da6e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..7519f8a3298
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5966847cd68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag 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/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..138c8dca802
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect 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/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c4171db3779
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/a-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect 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/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/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/req.attr/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/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ef804b83897
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to cross-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/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b19ef3e3d49
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-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 script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6aaebe4910c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-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 script-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/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..bba3879bff5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects stripped-referrer for script-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
+
+  [`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/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6426ad898ee
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for script-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
+
+  [`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/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..26e109e6785
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-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
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..f2f8f911fd1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-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 script-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/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2cf1aac9f5c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag 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/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..049768073e3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-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
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..797e9867d5e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to same-https 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/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..46e12c5828f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect 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/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..cfaafbfe470
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/req.attr/unsafe-url/script-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 script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/no-referrer/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/same-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/strict-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unsafe-url/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/no-referrer/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/same-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/strict-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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.meta/unsafe-url/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc.meta/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.meta/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/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5966847cd68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..138c8dca802
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c4171db3779
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect 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/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b406f5fa517
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/same-origin/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b406f5fa517
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-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/unsafe-url/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5966847cd68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..138c8dca802
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c4171db3779
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect 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/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5966847cd68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..138c8dca802
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c4171db3779
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/a-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect 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/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5966847cd68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..138c8dca802
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c4171db3779
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect 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/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/no-referrer/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b406f5fa517
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/same-origin/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/same-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/same-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/same-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/same-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/same-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/same-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/same-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/same-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..44a2d7f60d4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e6440352801
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b406f5fa517
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c3bdc1c7b55
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for a-tag 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/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/strict-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5966847cd68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..138c8dca802
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c4171db3779
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/a-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect 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/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unsafe-url/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/a-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5966847cd68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag 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/a-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..138c8dca802
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect 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/a-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d8cc86a5d26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for a-tag 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
+
+  [`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/a-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c4171db3779
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/a-tag/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
+
+  [Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect 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/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/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.meta/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/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/xhr/abort-after-stop.window.js.ini b/tests/wpt/metadata/xhr/abort-after-stop.window.js.ini
new file mode 100644
index 00000000000..93b4241799d
--- /dev/null
+++ b/tests/wpt/metadata/xhr/abort-after-stop.window.js.ini
@@ -0,0 +1,4 @@
+[abort-after-stop.window.html]
+  [XMLHttpRequest: abort event should fire when stop() method is used]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index 06fe7999246..58e8d6ee1dd 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -236,6 +236,7 @@ jobs:
   displayName: 'all tests: Edge Dev'
   condition: |
     or(eq(variables['Build.SourceBranch'], 'refs/heads/epochs/six_hourly'),
+       eq(variables['Build.SourceBranch'], 'refs/heads/triggers/edge_dev'),
        and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_edge_dev']))
   strategy:
     parallel: 10 # chosen to make runtime ~2h
@@ -271,6 +272,7 @@ jobs:
   displayName: 'all tests: Edge Canary'
   condition: |
     or(eq(variables['Build.SourceBranch'], 'refs/heads/epochs/six_hourly'),
+       eq(variables['Build.SourceBranch'], 'refs/heads/triggers/edge_canary'),
        and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_edge_canary']))
   strategy:
     parallel: 10 # chosen to make runtime ~2h
@@ -306,6 +308,7 @@ jobs:
   displayName: 'all tests: Safari'
   condition: |
     or(eq(variables['Build.SourceBranch'], 'refs/heads/epochs/daily'),
+       eq(variables['Build.SourceBranch'], 'refs/heads/triggers/safari_stable'),
        and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_safari']))
   strategy:
     parallel: 5 # chosen to make runtime ~2h
@@ -340,6 +343,7 @@ jobs:
   displayName: 'all tests: Safari Technology Preview'
   condition: |
     or(eq(variables['Build.SourceBranch'], 'refs/heads/epochs/six_hourly'),
+       eq(variables['Build.SourceBranch'], 'refs/heads/triggers/safari_preview'),
        and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_safari_preview']))
   strategy:
     parallel: 5 # chosen to make runtime ~2h
diff --git a/tests/wpt/web-platform-tests/.taskcluster.yml b/tests/wpt/web-platform-tests/.taskcluster.yml
index 1a162ed7402..0b7b50b35d4 100644
--- a/tests/wpt/web-platform-tests/.taskcluster.yml
+++ b/tests/wpt/web-platform-tests/.taskcluster.yml
@@ -13,7 +13,13 @@ tasks:
               $match: {
                 event.ref == "refs/heads/master": [{name: firefox, channel: nightly}, {name: chrome, channel: dev}],
                 event.ref == "refs/heads/epochs/daily": [{name: firefox, channel: stable}, {name: chrome, channel: stable}],
-                event.ref == "refs/heads/epochs/weekly": [{name: firefox, channel: beta}, {name: chrome, channel: beta}]
+                event.ref == "refs/heads/epochs/weekly": [{name: firefox, channel: beta}, {name: chrome, channel: beta}],
+                event.ref == "refs/heads/triggers/chrome_stable": [{name: chrome, channel: stable}],
+                event.ref == "refs/heads/triggers/chrome_beta": [{name: chrome, channel: beta}],
+                event.ref == "refs/heads/triggers/chrome_dev": [{name: chrome, channel: dev}],
+                event.ref == "refs/heads/triggers/firefox_stable": [{name: firefox, channel: stable}],
+                event.ref == "refs/heads/triggers/firefox_beta": [{name: firefox, channel: beta}],
+                event.ref == "refs/heads/triggers/firefox_nightly": [{name: firefox, channel: nightly}]
                 }
           each(browser):
             $map:
@@ -64,7 +70,7 @@ tasks:
                 owner: ${event.pusher.email}
                 source: ${event.repository.url}
               payload:
-                image: harjgam/web-platform-tests:0.32
+                image: harjgam/web-platform-tests:0.33
                 maxRunTime: 7200
                 artifacts:
                   public/results:
@@ -156,7 +162,7 @@ tasks:
                   owner: ${event.pull_request.user.login}@users.noreply.github.com
                   source: ${event.repository.url}
                 payload:
-                  image: harjgam/web-platform-tests:0.32
+                  image: harjgam/web-platform-tests:0.33
                   maxRunTime: 7200
                   artifacts:
                     public/results:
@@ -322,7 +328,7 @@ tasks:
                   owner: ${event.sender.login}@users.noreply.github.com
                   source: ${event.repository.url}
                 payload:
-                  image: harjgam/web-platform-tests:0.32
+                  image: harjgam/web-platform-tests:0.33
                   maxRunTime: 7200
                   artifacts:
                     public/results:
diff --git a/tests/wpt/web-platform-tests/2dcontext/tools/current-work-canvas.xhtml b/tests/wpt/web-platform-tests/2dcontext/tools/current-work-canvas.xhtml
index 1baf354028c..2bb889ab275 100644
--- a/tests/wpt/web-platform-tests/2dcontext/tools/current-work-canvas.xhtml
+++ b/tests/wpt/web-platform-tests/2dcontext/tools/current-work-canvas.xhtml
@@ -110,8 +110,6 @@
      font-size: 0.6em;
      column-width: 30em;
      column-gap: 1em;
-     -moz-column-width: 30em;
-     -moz-column-gap: 1em;
      -webkit-column-width: 30em;
      -webkit-column-gap: 1em;
    }
@@ -4575,4 +4573,4 @@ interface <a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rend
 
   
 
-  </body></html>
\ No newline at end of file
+  </body></html>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/html-spec-comms-isvalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/html-spec-comms-isvalid.html
index 69f70d5d667..2124406a319 100644
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/html-spec-comms-isvalid.html
+++ b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/style/html-spec-comms-isvalid.html
@@ -114,8 +114,6 @@
      font-size: 0.6em;
      column-width: 30em;
      column-gap: 1em;
-     -moz-column-width: 30em;
-     -moz-column-gap: 1em;
      -webkit-column-width: 30em;
      -webkit-column-gap: 1em;
    }
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Alexis_of_Russia-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Alexis_of_Russia-novalid.html
index f56e459f295..687213c3b94 100644
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Alexis_of_Russia-novalid.html
+++ b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Alexis_of_Russia-novalid.html
@@ -1572,7 +1572,7 @@ mw.user.tokens.set({"editToken":"+\\","patrolToken":"+\\","watchToken":"+\\","cs
 <li><i><a href="/wiki/%D0%A5%D0%BC%D1%8B%D1%80%D0%BE%D0%B2,_%D0%9C%D0%B8%D1%85%D0%B0%D0%B8%D0%BB_%D0%94%D0%BC%D0%B8%D1%82%D1%80%D0%B8%D0%B5%D0%B2%D0%B8%D1%87" title="Хмыров, Михаил Дмитриевич">Хмыров М. Д.</a></i> Царь Алексей Михайлович и его время (в «Древ. и нов. России», т. III, 1875&#160;г.)</li>
 </ul>
 <h2><span class="mw-headline" id=".D0.9F.D1.80.D0.B8.D0.BC.D0.B5.D1.87.D0.B0.D0.BD.D0.B8.D1.8F">Примечания</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/w/index.php?title=%D0%90%D0%BB%D0%B5%D0%BA%D1%81%D0%B5%D0%B9_%D0%9C%D0%B8%D1%85%D0%B0%D0%B9%D0%BB%D0%BE%D0%B2%D0%B8%D1%87&amp;veaction=edit&amp;section=20" class="mw-editsection-visualeditor" title="Редактировать раздел «Примечания»">править</a><span class="mw-editsection-divider"> | </span><a href="/w/index.php?title=%D0%90%D0%BB%D0%B5%D0%BA%D1%81%D0%B5%D0%B9_%D0%9C%D0%B8%D1%85%D0%B0%D0%B9%D0%BB%D0%BE%D0%B2%D0%B8%D1%87&amp;action=edit&amp;section=20" title="Редактировать раздел «Примечания»">править вики-текст</a><span class="mw-editsection-bracket">]</span></span></h2>
-<div class="references-small columns" style="column-count:2;-moz-column-count:2;-webkit-column-count:2;">
+<div class="references-small columns" style="column-count:2;-webkit-column-count:2;">
 <ol class="references">
 <li id="cite_note-1"><b><a href="#cite_ref-1">↑</a></b> <span class="reference-text">«Тишайший» (<a href="/wiki/%D0%9B%D0%B0%D1%82%D0%B8%D0%BD%D1%81%D0%BA%D0%B8%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA" title="Латинский язык">лат.</a>&#160;<i><span lang="la" xml:lang="la">clementissimus</span></i>)&#160;— почётный титул латиноязычного происхождения, означающий «тишину» (спокойствие, благоденствие) в стране во время правления государя. К качествам характера Алексея Михайловича отношения не имеет. Впоследствии, когда в дипломатии латинский язык был заменён французским, прежнее величание «clementissimus» переведено было на французский (<a href="/wiki/%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D1%83%D0%B7%D1%81%D0%BA%D0%B8%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA" title="Французский язык">фр.</a>&#160;<i><span lang="fr" xml:lang="fr">tres gracieux</span></i>), а в России уже с французского перевели как «всемилостивейший», и это название было также применено к государеву титулу, взамен прежнего «тишайший».</span></li>
 <li id="cite_note-2"><b><a href="#cite_ref-2">↑</a></b> <span class="reference-text"><a rel="nofollow" class="external text" href="http://www.sedmitza.ru/lib/text/439363/">Новый летописец, XVIII</a></span></li>
diff --git a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Naser_al-Din_Shah_Qajar-novalid.html b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Naser_al-Din_Shah_Qajar-novalid.html
index a1588dc1837..1277d757cae 100644
--- a/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Naser_al-Din_Shah_Qajar-novalid.html
+++ b/tests/wpt/web-platform-tests/conformance-checkers/html/elements/table/integrity/Naser_al-Din_Shah_Qajar-novalid.html
@@ -2083,7 +2083,7 @@ mw.user.tokens.set({"editToken":"+\\","patrolToken":"+\\","watchToken":"+\\","cs
 <li><a href="/wiki/%D8%A7%D9%85%DB%8C%D8%B1_%D8%A7%D8%B1%D8%B3%D9%84%D8%A7%D9%86_%D9%86%D8%A7%D9%85%D8%AF%D8%A7%D8%B1" title="امیر ارسلان نامدار">امیر ارسلان نامدار</a></li>
 </ul>
 <h2><span class="mw-headline" id=".D9.BE.D8.A7.D9.86.D9.88.DB.8C.D8.B3">پانویس</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/w/index.php?title=%D9%86%D8%A7%D8%B5%D8%B1%D8%A7%D9%84%D8%AF%DB%8C%D9%86%E2%80%8C%D8%B4%D8%A7%D9%87_%D9%82%D8%A7%D8%AC%D8%A7%D8%B1&amp;action=edit&amp;section=47" title="ویرایش بخش: پانویس">ویرایش</a><span class="mw-editsection-bracket">]</span></span></h2>
-<div class="reflist references-small references-column-count references-column-count-3" style="column-count: 3; -moz-column-count: 3; -webkit-column-count: 3;">
+<div class="reflist references-small references-column-count references-column-count-3" style="column-count: 3; -webkit-column-count: 3;">
 <ol class="references">
 <li id="cite_note-1"><span class="mw-cite-backlink"><a href="#cite_ref-1">↑</a></span> <span class="reference-text"><span class="citation web" id="CITEREF2014"><a rel="nofollow" class="external text" href="http://www.jomhouriat.ir/fa/content/17464/مادر-ناصرالدین-شاه--عکس">«مادر ناصرالدین شاه / عکس»</a>. <i>پایگاه خبری تحلیلی جمهوریت</i>. ۲۰۱۴-۰۸-۲۴<span class="reference-accessdate">. بازبینی‌شده در ۲۰۱۴-۰۸-۲۳</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=%D9%85%D8%A7%D8%AF%D8%B1+%D9%86%D8%A7%D8%B5%D8%B1%D8%A7%D9%84%D8%AF%DB%8C%D9%86+%D8%B4%D8%A7%D9%87+%2F+%D8%B9%DA%A9%D8%B3&amp;rft.atitle=%D9%BE%D8%A7%DB%8C%DA%AF%D8%A7%D9%87+%D8%AE%D8%A8%D8%B1%DB%8C+%D8%AA%D8%AD%D9%84%DB%8C%D9%84%DB%8C+%D8%AC%D9%85%D9%87%D9%88%D8%B1%DB%8C%D8%AA&amp;rft.date=%DB%B2%DB%B0%DB%B1%DB%B4-%DB%B0%DB%B8-%DB%B2%DB%B4&amp;rft_id=http%3A%2F%2Fwww.jomhouriat.ir%2Ffa%2Fcontent%2F17464%2F%D9%85%D8%A7%D8%AF%D8%B1-%D9%86%D8%A7%D8%B5%D8%B1%D8%A7%D9%84%D8%AF%DB%8C%D9%86-%D8%B4%D8%A7%D9%87--%D8%B9%DA%A9%D8%B3&amp;rfr_id=info:sid/fa.wikipedia.org:%D9%86%D8%A7%D8%B5%D8%B1%D8%A7%D9%84%D8%AF%DB%8C%D9%86%E2%80%8C%D8%B4%D8%A7%D9%87_%D9%82%D8%A7%D8%AC%D8%A7%D8%B1"><span style="display: none;">&#160;</span></span></span></li>
 <li id="cite_note-qajarpages.org-2"><span class="mw-cite-backlink">↑ <sup><a href="#cite_ref-qajarpages.org_2-0">۲٫۰</a></sup> <sup><a href="#cite_ref-qajarpages.org_2-1">۲٫۱</a></sup></span> <span class="reference-text"><span class="citation web" id="CITEREFM._Eskandari-Kadjar">M. Eskandari-Kadjar. <a rel="nofollow" class="external text" href="http://www.qajarpages.org/mohammadshahchildren.html">«Children of Mohammad Shah Qajar»</a>. qajarpages<span class="reference-accessdate">. بازبینی‌شده در ۲۲ اسفند ۱۳۹۰</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Children+of+Mohammad+Shah+Qajar&amp;rft.atitle=&amp;rft.aulast=M.+Eskandari-Kadjar&amp;rft.au=M.+Eskandari-Kadjar&amp;rft.pub=qajarpages&amp;rft_id=http%3A%2F%2Fwww.qajarpages.org%2Fmohammadshahchildren.html&amp;rfr_id=info:sid/fa.wikipedia.org:%D9%86%D8%A7%D8%B5%D8%B1%D8%A7%D9%84%D8%AF%DB%8C%D9%86%E2%80%8C%D8%B4%D8%A7%D9%87_%D9%82%D8%A7%D8%AC%D8%A7%D8%B1"><span style="display: none;">&#160;</span></span></span></li>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-003.html
index 37109e2e780..9d434cf7cb8 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-003.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-003.html
@@ -31,6 +31,12 @@
     background: orange;
     display: block;
 }
+.vert-wm {
+    writing-mode: vertical-rl;
+}
+.horiz-wm {
+    writing-mode: horizontal-tb;
+}
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -82,5 +88,29 @@
     </div>
 </div>
 
+<!-- indefinite unwrapped column flexbox, with orthogonal-flow flex item. The
+     flex item's main size (height) is definite, since it's the item's inline
+     size, and inline sizes always end up definite. -->
+<div style="height: 100px;">
+    <div class="flexbox column">
+        <div class="vert-wm">
+            <span data-expected-height="100"></span>
+        </div>
+    </div>
+</div>
+
+<!-- indefinite unwrapped row-oriented vertical-writing-mode flexbox, with
+     orthogonal-flow (horizontal-writing-mode) flex item. The flex item's
+     height (main size) is definite, since its parent flex container has a
+     definite main size, because the flex container's main axis is its
+     inline-axis and inline sizes are definite. -->
+<div style="height: 100px;">
+    <div class="flexbox vert-wm">
+        <div class="horiz-wm">
+            <span data-expected-height="100"></span>
+        </div>
+    </div>
+</div>
+
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht b/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht
index 9287f2679ec..8fa8fdb7280 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht
@@ -46,7 +46,7 @@
 
     1.0em : margin-left of outer div
     8.0em : width of 1st column box
-    1.0em : first -moz-column-gap
+    1.0em : first column-gap
     8.0em : width of 2nd column box
     0.0em : (1.0em / 2) - (1.0em / 2) : left edge of 2nd column-rule
   =========
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-at-bottom-right-on-viewport.html b/tests/wpt/web-platform-tests/css/css-position/position-fixed-at-bottom-right-on-viewport.html
new file mode 100644
index 00000000000..9184db028e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-position/position-fixed-at-bottom-right-on-viewport.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name="viewport" content="width=device-width">
+<link rel="help" href="https://drafts.csswg.org/css-position/#fixed-pos">
+<meta name="assert" content="This test checks that `bottom` and `right` returned by getComputedStyle for position:fixed elements attached to right bottom of the layout viewport expaned to the minimum-scale size">
+<title></title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<style>
+html, body {
+  margin: 0;
+  width: 100%;
+  height: 100%;
+}
+#target {
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  background: green;
+  width: 100px;
+  height: 100px;
+}
+</style>
+<div style="width: 200%; height: 200%;"></div>
+<div id="target"></div>
+<script>
+test(() => {
+  assert_equals(getComputedStyle(target).bottom, "0px");
+  assert_equals(getComputedStyle(target).right, "0px");
+}, "position:fixed ");
+</script>
diff --git a/tests/wpt/web-platform-tests/docs/running-tests/from-ci.md b/tests/wpt/web-platform-tests/docs/running-tests/from-ci.md
new file mode 100644
index 00000000000..9ea142bb4ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/docs/running-tests/from-ci.md
@@ -0,0 +1,32 @@
+# Running Tests on CI
+
+Contributors with write access to the repository can trigger full runs in the
+same CI systems used to produce results for [wpt.fyi](https://wpt.fyi). The runs
+are triggered by pushing to branch names on the form `triggers/$browser_$channel`
+and the results will be automatically submitted to wpt.fyi.
+
+This is useful when making infrastructure changes that could affect very many
+tests, in order to avoid regressions.
+
+Note: Full runs use a lot of CI resources, so please take care to not trigger
+them more than necessary.
+
+Instructions:
+
+ * Base your changes on a commit for which there are already results in wpt.fyi.
+
+ * Determine which branch name to push to by looking for `refs/heads/triggers/`
+   in `.azure-pipelines.yml` and `.taskcluster.yml`. For example, to trigger a
+   full run of Safari Technology Preview, the branch name is
+   `triggers/safari_preview`.
+
+ * Force push to the branch, for example:
+   `git push --force-with-lease origin HEAD:triggers/safari_preview`.
+   The `--force-with-lease` argument is to detect if someone else has just
+   pushed. When this happens wait for the checkout step of their triggered run
+   to finish before you force push again.
+
+You can see if the run started from the commit status on GitHub's commits listing
+([example](https://github.com/web-platform-tests/wpt/commits/triggers/safari_preview))
+and if successful the results will show up on wpt.fyi within 10 minutes
+([example](https://wpt.fyi/runs?product=safari)).
diff --git a/tests/wpt/web-platform-tests/docs/running-tests/index.md b/tests/wpt/web-platform-tests/docs/running-tests/index.md
index 7e8a9913132..17b361dde8f 100644
--- a/tests/wpt/web-platform-tests/docs/running-tests/index.md
+++ b/tests/wpt/web-platform-tests/docs/running-tests/index.md
@@ -5,6 +5,7 @@
 
    from-web
    from-local-system
+   from-ci
    custom-runner
    ../tools/certs/README.md
 ```
@@ -15,6 +16,9 @@ that approach is available in [Running tests from the Web](from-web).
 Contributors who are interested in modifying and creating tests should refer to
 [Running Tests from the Local System](from-local-system).
 
+Contributors with write access to the repository can also trigger full runs
+in our CI setups, see [Running Tests on CI](from-ci).
+
 Advanced use cases may call for a customized method of executing the tests.
 Guidelines for writing a custom "runner" are available at [Writing Your Own
 Runner](custom-runner).
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html
index bdef39cde8c..d999c977dbe 100644
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html
+++ b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html
@@ -10,7 +10,7 @@ const check_report_format = ([reports, observer]) => {
   const report = reports[0];
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
-  assert_equals(report.body.featureId, "vr");
+  assert_equals(report.body.featureId, "xr");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html.headers
index 0761021f45e..47b7c824b35 100644
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html.headers
+++ b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html.headers
@@ -1 +1 @@
-Feature-Policy-Report-Only: vr 'none'
+Feature-Policy-Report-Only: xr 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html
index 3ce61cd13ac..68a3e4e737b 100644
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html
+++ b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html
@@ -10,7 +10,7 @@ var check_report_format = (reports, observer) => {
   let report = reports[0];
   assert_equals(report.type, "feature-policy-violation");
   assert_equals(report.url, document.location.href);
-  assert_equals(report.body.featureId, "vr");
+  assert_equals(report.body.featureId, "xr");
   assert_equals(report.body.sourceFile, document.location.href);
   assert_equals(typeof report.body.lineNumber, "number");
   assert_equals(typeof report.body.columnNumber, "number");
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html.headers
index d021af75636..ea8722131ce 100644
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html.headers
+++ b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-reporting.https.html.headers
@@ -1 +1 @@
-Feature-Policy: vr 'none'
+Feature-Policy: xr 'none'
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/appcache.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/appcache.tentative.https.sub.html
new file mode 100644
index 00000000000..5d583380ea1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/appcache.tentative.https.sub.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html manifest="/fetch/sec-metadata/resources/record-header.py?file=appcache-manifest">
+<meta name="timeout" content="long">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/fetch/sec-metadata/resources/helper.js></script>
+<script src=/common/utils.js></script>
+<body></body>
+<script>
+  async_test(t => {
+    window.applicationCache.oncached = window.applicationCache.onnoupdate = window.applicationCache.onerror = t.step_func(e => {
+        fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=appcache-manifest")
+          .then(t.step_func(response => response.text()))
+          .then(t.step_func_done(text => assert_header_equals(text, {
+            "dest": "",
+            "site": "same-origin",
+            "user": "",
+            "mode": "no-cors"
+          })))
+          .catch(t.unreached_func("Fetching and verifying the results should succeed."));
+    });
+  }, "Appcache!");
+</script>
diff --git a/tests/wpt/web-platform-tests/interfaces/payment-request.idl b/tests/wpt/web-platform-tests/interfaces/payment-request.idl
index fefdc6f3617..e41cae2f06d 100644
--- a/tests/wpt/web-platform-tests/interfaces/payment-request.idl
+++ b/tests/wpt/web-platform-tests/interfaces/payment-request.idl
@@ -3,9 +3,13 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: Payment Request API (https://w3c.github.io/payment-request/)
 
-[Constructor(sequence<PaymentMethodData> methodData, PaymentDetailsInit details, optional PaymentOptions options = {}),
-SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface PaymentRequest : EventTarget {
+  constructor(
+    sequence<PaymentMethodData> methodData,
+    PaymentDetailsInit details,
+    optional PaymentOptions options = {}
+  );
   [NewObject]
   Promise<PaymentResponse> show(optional Promise<PaymentDetailsUpdate> detailsPromise);
   [NewObject]
@@ -171,9 +175,9 @@ dictionary PayerErrors {
   DOMString phone;
 };
 
-[Constructor(DOMString type, optional MerchantValidationEventInit eventInitDict = {}),
-SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface MerchantValidationEvent : Event {
+  constructor(DOMString type, optional MerchantValidationEventInit eventInitDict = {});
   readonly attribute DOMString methodName;
   readonly attribute USVString validationURL;
   void complete(Promise<any> merchantSessionPromise);
@@ -184,8 +188,9 @@ dictionary MerchantValidationEventInit : EventInit {
   USVString validationURL = "";
 };
 
-[Constructor(DOMString type, optional PaymentMethodChangeEventInit eventInitDict = {}), SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface PaymentMethodChangeEvent : PaymentRequestUpdateEvent {
+  constructor(DOMString type, optional PaymentMethodChangeEventInit eventInitDict = {});
   readonly attribute DOMString methodName;
   readonly attribute object? methodDetails;
 };
@@ -195,8 +200,9 @@ dictionary PaymentMethodChangeEventInit : PaymentRequestUpdateEventInit {
   object? methodDetails = null;
 };
 
-[Constructor(DOMString type, optional PaymentRequestUpdateEventInit eventInitDict = {}), SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface PaymentRequestUpdateEvent : Event {
+  constructor(DOMString type, optional PaymentRequestUpdateEventInit eventInitDict = {});
   void updateWith(Promise<PaymentDetailsUpdate> detailsPromise);
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
index 8c77339ae86..b08bc7d4069 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
@@ -6,13 +6,10 @@
 [Exposed=Window]
 interface NDEFMessage {
   constructor(NDEFMessageInit messageInit);
-
-  readonly attribute USVString url;
   readonly attribute FrozenArray<NDEFRecord> records;
 };
 
 dictionary NDEFMessageInit {
-  USVString url;
   sequence<NDEFRecordInit> records;
 };
 
@@ -99,7 +96,7 @@ enum NFCPushTarget {
 };
 
 dictionary NFCScanOptions {
-  USVString url = "";
+  USVString id = "";
   NDEFRecordType recordType;
   USVString mediaType = "";
   AbortSignal? signal;
diff --git a/tests/wpt/web-platform-tests/interfaces/webxr.idl b/tests/wpt/web-platform-tests/interfaces/webxr.idl
index 413fef85c87..809f3e4b6ad 100644
--- a/tests/wpt/web-platform-tests/interfaces/webxr.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webxr.idl
@@ -111,7 +111,7 @@ enum XREye {
 
 [SecureContext, Exposed=Window] interface XRView {
   readonly attribute XREye eye;
-  [SameObject] readonly attribute Float32Array projectionMatrix;
+  readonly attribute Float32Array projectionMatrix;
   [SameObject] readonly attribute XRRigidTransform transform;
 };
 
diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist
index 8ff3b818932..17ccf19f80a 100644
--- a/tests/wpt/web-platform-tests/lint.whitelist
+++ b/tests/wpt/web-platform-tests/lint.whitelist
@@ -822,7 +822,7 @@ WEB-PLATFORM.TEST:signed-exchange/resources/generate-test-sxgs.sh
 
 # https://github.com/web-platform-tests/wpt/issues/16455
 MISSING DEPENDENCY: idle-detection/interceptor.https.html
-MISSING DEPENDENCY: sms/sms_provider.js
+MISSING DEPENDENCY: sms/resources/helper.js
 MISSING DEPENDENCY: web-nfc/resources/nfc-helpers.js
 MISSING DEPENDENCY: shape-detection/resources/shapedetection-helpers.js
 MISSING DEPENDENCY: webxr/resources/webxr_util.js
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html
new file mode 100644
index 00000000000..1bb086daddd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<html>
+<head>
+<title>enumerateDevices: test enumerateDevices should not expose camera devices if they are not allowed to use</title>
+<link rel="help" href="https://w3c.github.io/mediacapture-main/#dom-mediadevices-enumeratedevices">
+<meta name='assert' content='Check that the enumerateDevices() method should not exposed camera devices.'/>
+</head>
+<body>
+<h1 class="instructions">Description</h1>
+<p class="instructions">This test checks for the presence of camera in
+<code>navigator.mediaDevices.enumerateDevices()</code> method.</p>
+<div id='log'></div>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+"use strict";
+promise_test(async () => {
+  assert_not_equals(navigator.mediaDevices.enumerateDevices, undefined, "navigator.mediaDevices.enumerateDevices exists");
+  const deviceList =  await navigator.mediaDevices.enumerateDevices();
+  for (const mediaInfo of deviceList) {
+    assert_not_equals(mediaInfo.deviceId, undefined, "mediaInfo's deviceId should exist.");
+    assert_not_equals(mediaInfo.kind, undefined,     "mediaInfo's kind     should exist.");
+    assert_not_equals(mediaInfo.label, undefined,    "mediaInfo's label    should exist.");
+    assert_not_equals(mediaInfo.groupId, undefined,  "mediaInfo's groupId  should exist.");
+    assert_in_array(mediaInfo.kind, ["audioinput", "audiooutput"]);
+  }
+}, "Camera is not exposed in mediaDevices.enumerateDevices()");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html.headers b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html.headers
new file mode 100644
index 00000000000..2adc5e237fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-camera.https.html.headers
@@ -0,0 +1 @@
+Feature-Policy: camera 'none'
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html
new file mode 100644
index 00000000000..8d535ce551d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<html>
+<head>
+<title>enumerateDevices: test enumerateDevices should not expose microphone devices if they are not allowed to use</title>
+<link rel="help" href="https://w3c.github.io/mediacapture-main/#dom-mediadevices-enumeratedevices">
+<meta name='assert' content='Check that the enumerateDevices() method should not exposed microphone devices.'/>
+</head>
+<body>
+<h1 class="instructions">Description</h1>
+<p class="instructions">This test checks for the presence of microphone in
+<code>navigator.mediaDevices.enumerateDevices()</code> method.</p>
+<div id='log'></div>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+"use strict";
+promise_test(async () => {
+  assert_not_equals(navigator.mediaDevices.enumerateDevices, undefined, "navigator.mediaDevices.enumerateDevices exists");
+  const deviceList =  await navigator.mediaDevices.enumerateDevices();
+  for (const mediaInfo of deviceList) {
+    assert_not_equals(mediaInfo.deviceId, undefined, "mediaInfo's deviceId should exist.");
+    assert_not_equals(mediaInfo.kind, undefined,     "mediaInfo's kind     should exist.");
+    assert_not_equals(mediaInfo.label, undefined,    "mediaInfo's label    should exist.");
+    assert_not_equals(mediaInfo.groupId, undefined,  "mediaInfo's groupId  should exist.");
+    assert_in_array(mediaInfo.kind, ["videoinput", "audiooutput"]);
+  }
+}, "Microphone is not exposed in mediaDevices.enumerateDevices()");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html.headers b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html.headers
new file mode 100644
index 00000000000..a86e0a07785
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices-not-allowed-mic.https.html.headers
@@ -0,0 +1 @@
+Feature-Policy: microphone 'none'
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html
index 76ca435cf58..efb46073169 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-enumerateDevices.https.html
@@ -17,26 +17,26 @@
 "use strict";
 //NOTE ALEX: for completion, a test for ondevicechange event is missing.
 promise_test(async () => {
-  assert_true(undefined !== navigator.mediaDevices.enumerateDevices, "navigator.mediaDevices.enumerateDevices exists");
-  const device_list =  await navigator.mediaDevices.enumerateDevices();
-  for (const mediainfo of device_list) {
-    assert_true(undefined !== mediainfo.deviceId, "mediaInfo's deviceId should exist.");
-    assert_true(undefined !== mediainfo.kind,     "mediaInfo's kind     should exist.");
-    assert_in_array(mediainfo.kind, ["videoinput", "audioinput", "audiooutput"]);
-    assert_true(undefined !== mediainfo.label,    "mediaInfo's label    should exist.");
-    assert_true(undefined !== mediainfo.groupId,  "mediaInfo's groupId  should exist.");
+  assert_not_equals(navigator.mediaDevices.enumerateDevices, undefined, "navigator.mediaDevices.enumerateDevices exists");
+  const deviceList =  await navigator.mediaDevices.enumerateDevices();
+  for (const mediaInfo of deviceList) {
+    assert_not_equals(mediaInfo.deviceId, undefined, "mediaInfo's deviceId should exist.");
+    assert_not_equals(mediaInfo.kind, undefined,     "mediaInfo's kind     should exist.");
+    assert_not_equals(mediaInfo.label, undefined,    "mediaInfo's label    should exist.");
+    assert_not_equals(mediaInfo.groupId, undefined,  "mediaInfo's groupId  should exist.");
+    assert_in_array(mediaInfo.kind, ["videoinput", "audioinput", "audiooutput"]);
   }
 }, "mediaDevices.enumerateDevices() is present and working");
 
 promise_test(async () => {
-  const device_list =  await navigator.mediaDevices.enumerateDevices();
-  for (const mediainfo of device_list) {
-    if (mediainfo.kind == "audioinput" || mediainfo.kind == "videoinput") {
-      assert_true(mediainfo instanceof InputDeviceInfo);
-    } else if ( mediainfo.kind == "audiooutput" ) {
-      assert_true(mediainfo instanceof MediaDeviceInfo);
+  const deviceList =  await navigator.mediaDevices.enumerateDevices();
+  for (const mediaInfo of deviceList) {
+    if (mediaInfo.kind == "audioinput" || mediaInfo.kind == "videoinput") {
+      assert_true(mediaInfo instanceof InputDeviceInfo);
+    } else if ( mediaInfo.kind == "audiooutput" ) {
+      assert_true(mediaInfo instanceof MediaDeviceInfo);
     } else {
-      assert_unreached("mediainfo.kind should be one of 'audioinput', 'videoinput', or 'audiooutput'.")
+      assert_unreached("mediaInfo.kind should be one of 'audioinput', 'videoinput', or 'audiooutput'.")
     }
   }
 }, "InputDeviceInfo is supported");
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/tools/__init__.py b/tests/wpt/web-platform-tests/mixed-content/generic/tools/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/tools/clean.py b/tests/wpt/web-platform-tests/mixed-content/generic/tools/clean.py
deleted file mode 100755
index 15f294b5c8c..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/generic/tools/clean.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-
-import os, json
-from common_paths import *
-import spec_validator
-
-def rmtree(top):
-    top = os.path.abspath(top)
-    assert top != os.path.expanduser("~")
-    assert len(top) > len(os.path.expanduser("~"))
-    assert "mixed-content" in top
-
-    for root, dirs, files in os.walk(top, topdown=False):
-        for name in files:
-            os.remove(os.path.join(root, name))
-        for name in dirs:
-            os.rmdir(os.path.join(root, name))
-
-    os.rmdir(top)
-
-def main():
-    spec_json = load_spec_json();
-    spec_validator.assert_valid_spec_json(spec_json)
-
-    for spec in spec_json['specification']:
-        generated_dir = os.path.join(spec_directory, spec["name"])
-        if (os.path.isdir(generated_dir)):
-            rmtree(generated_dir)
-
-    if (os.path.isfile(generated_spec_json_filename)):
-        os.remove(generated_spec_json_filename)
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/tools/regenerate b/tests/wpt/web-platform-tests/mixed-content/generic/tools/regenerate
deleted file mode 100755
index e6bd63519b3..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/generic/tools/regenerate
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-python $DIR/clean.py && python $DIR/generate.py
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
index 57fb4a946c1..4825a827944 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
index ea712646bb1..647787e61ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
index f0d321a52cf..decf80de2e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
index 43435ff17b2..b6a5a5de6ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..1a27c3a0869
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
index 387f84c09ba..aa0039c7942 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..6b07b76078f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..7e8eb2f5264
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
index 0d592b59d40..808591bba78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..c34d02b350b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..c27bc9cbe1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
index 59322a856e0..31215abda87 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ed8626df8c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..692b4c53e7f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
index 0ac4282fb41..9c7ab68b3af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..245b7351518
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..d74dd271bd2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
index 2b1ee01973e..d48ed4ea2bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..ad81b76b785
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..08991299f88
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
index df88f442fab..9823e572567 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..2a70a7b876e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..9d16178c144
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
index 463728a4ecd..00e09a77d13 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..20bade73d06
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..b901bb35756
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
index 3ef49b93f0f..11606941512 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..0b78a17424c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..72e0986a09e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
index 59d852294b2..e7b0bfc2c89 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..09b05d5fe6e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..68e5a86b435
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
index c54ac62bfe9..2c0ddc8ae6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..66a603db605
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..c54bb84a6f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
index 89da6893a20..fdcceccd942 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..5614f7694d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..49d1b82be5f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
index 793166af730..1290a24677a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..4776ae42efb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer-when-downgrade"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html
index e2404361ecd..0916a69fb52 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html
index d0ab6e1ccbe..21169cace65 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html
index 4140287d379..8b9af508842 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html
index 08dd0a18a46..ea6929b55bd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..f17babd6b74
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html
index 15e97825424..27f2a91c25e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..f8de0159aa0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..2fac3de9cd1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html
index 4af019d39fb..827db9aab6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..a154c88d555
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..2f3fc57ea10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html
index 086c8b1a047..886fb1c0620 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..f2cff2549cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..a4bb33091ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html
index ae67228e393..a531d13b739 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..8f05dc73f1f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..6358c82b79b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html
index 661a0cb964c..1fb24101820 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..79ac1fd5e86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..259311f3b4e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html
index 8d08d63d728..dcd8eae0ea3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..4473d6d9049
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..8eb9b89a500
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html
index 41a4c940c12..bced80f139a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..1dc8cd37db2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..d1709213c34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html
index 795774b4006..50541ed1828 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..aae8174b856
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..5a4e2658218
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html
index 79be70d7587..9389cdd10a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..4166472aa12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..ee4cd8d1df6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html
index b874f1970b1..fdb452ec73c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..66a65789f04
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..22b0a5c4011
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html
index 3a1d16bec4e..a3c33c35151 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..f17d8809515
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..0dd372af5a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html
index acf4458a168..8ed8c45f6bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is omitted 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..331ef74c332
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "no-referrer"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index 630393ca7b7..9d80e4eecdc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index ffc0a2ee559..a4315847468 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index baf2fe78440..5ccee6e3f10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index 89532a53691..56545c05ba8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
index 8b215bc8f4c..ef7a45d88ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
index 288fa038a4f..ee59f03f364 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..5c437e00b1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..87e2d1934d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
index 3f0455561a7..cf3b6f9f246 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..8c0ad2782c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..6e715b9ecdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
index e6de3ee6078..9bf71ddb2ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..0c9d06784e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..407c6c2cd27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
index 7ba2e047912..06ec85c630c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..cc194c3fec9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index e47bca42c76..106dedcdc8d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 94d9aa008c8..1c3e33a4a06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..61fbf48a46c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..9dcd043bea7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index f2482c3b3ae..c65bcef8783 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..7753e3bfc98
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..992f9289455
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 9d006903a0e..5e41bb0cc9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..7f3de2db402
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..70007a98bfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 3ae29a17caa..be6efd6d485 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..fbd23adf84e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
index 511058ccf50..aeb25636b7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
index d486a7b8569..0427b033f38 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..2af95f1d68a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..3298ff9e129
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
index 2f6692c4293..5ece6e19585 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..d2179b0438d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..a6cddc510df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
index 08c297eae3b..734a16e4b1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..678f150c190
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..eca7111fc90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
index 77c266d21e2..dc2a2a0dd0c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..798557359cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html
index 330d3f0f907..64c04a97042 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html
index ef0836b8e87..c98597dadce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html
index ec64d6fff5a..614150e785b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html
index 1a8ab2b4830..737081aa79a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..84bf51c4d18
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html
index 61323de7a02..9b17cbf92f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..9ec69dda44d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..fd44f0ca282
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html
index adce8bdb569..50a4d48a8d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..20f1d03a529
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..d94085f06d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html
index c404fcf03f9..d9ccac88225 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..c25527091fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..f8b5fc04fd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html
index 8f130d28a17..d060772ff53 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..7f0b59b2f7f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..c186c75bb15
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html
index 72e74ac6802..88c7b019ae7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..25181372ef7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..116b4bb7e31
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html
index 40e7caed485..2e43d922fb7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..d4b14f6272b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..2f7952592a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html
index 90a500cfae7..5c6ec1b352a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..6949391f89f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..1a3356ae51f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html
index 48631e39d26..c2f0761b051 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..e1248a84087
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..554944e4477
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html
index 4000dd3467d..39e5faeb839 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..f8041536ec7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..3d247e1a1a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html
index ff7e409b8d9..6f72764dc1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..4c50a6390ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..91215484309
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html
index b174ef4feca..9c37207b556 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ef85410bc78
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..9689f00cf8e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html
index 2d2ef35f681..4265d254528 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..9e37ad97785
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html
index 7bcc2189a06..a624bd10eae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html
index b37889b65b8..af720c30018 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html
index 0f0f3f586c7..bce9eed482b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html
similarity index 52%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html
index 1e785d961ab..a7b2ab3f67c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html
index 92b1559f77a..263ec260bc1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html
similarity index 52%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html
index 052a9df8e71..95c93beb732 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..a33d854bdf1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html
index 0e379e43123..63e596c1514 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..171502c50e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..4903ca5f675
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html
index 03618c360eb..502bb9c8f36 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..007dad5d22d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..fa7185a86dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html
similarity index 52%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html
index 96fc319aeeb..0045f09d8fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html
index 7a1fd76a930..a8f8b3caeac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html
similarity index 52%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html
index 9b7cf05f66e..a43218e73b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..922463d4fa7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html
index 289aa3faacd..61a04a95880 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..821db669012
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..f3a5cb72203
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html
index c61e82351ab..4f22a025f9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..b7e82f0bc13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..6120f05ba5f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html
similarity index 52%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html
index b5c0081ef67..4ebe79eb629 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html
index adbecffb505..ec74a0ee7d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html
similarity index 52%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html
index a0942713fda..7cb88653f5f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..5f166310700
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html
index 7e99eba7a8c..c8e318f31d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..2158ee39119
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..375395fd85c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html
index a67da150084..4664e066550 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..0ff52d2743b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..8a5db6047dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "same-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index 849efbc4e7f..6dcd37b4fc3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index 7230246dd23..95894095f54 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index 3baa66d36b8..8eca6aafee4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index a90739dc499..50ca73cff70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
index b56aa7a2c44..60abdb72fd9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
index 8481ed5ab38..ffa9d7df39e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..b62cfd679c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..44a2e79c1c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
index 0f8d60ca672..4e406e5c69b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..4a75656e176
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..315fd275eca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
index 8b036117d70..0ff3797bc5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..20324578e4e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..755a98e193b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
index 72dcd1d2738..5cfe32ce99c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..19172dab930
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 7d2599a1b71..a3449e24234 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 1a6e2a4aeb3..7032a630656 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..d97e2d45e30
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..30c698c9844
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 948bb087919..61c321098ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..f0966ed410f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..01e02272561
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 984b0790d42..81bbff6895f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..c6b90c2c3fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..07c064b1d59
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 6087f4b7db9..d947eda5e16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..facfbf66bb5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
index 5345da2d6d4..e12bf944e9b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
index 2e6a113369b..a7ad127967f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..944ce80657a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..974c0a7582e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
index 66f41a0e325..c0a4cfb746f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..06e50c50c3e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..05e3b36ef79
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
index c38f3063536..c7b22009071 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..d1d3b72459b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..8660d6beb4f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
index 9403ed73bcd..94bda07c22e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..a60910158f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin-when-cross-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html
index f80ba375958..b0dbaa7bc6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html
index 2fb347ef35b..0829171af48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html
index bd278695088..278db907811 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html
index 9c5035945c9..5ce0e76a00e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..38ac8138abb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html
index 050eb6a3904..44ef01de4c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..ebb7dd47cd9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..1596f431562
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html
index b26af2a076c..f84e8b14297 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..6dce9d9ea95
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..78b4970347b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html
index f992e393925..ce839946a54 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..fe7607d37a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..10792aa2cef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html
index a860c257fd7..f56167da6d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..379db165aed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..0fcf0480dde
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html
index 5d8be2bd928..2d0f92a3bf4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..bf42c7baa81
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..35497b2a02d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html
index 2f99fa63217..4cf4755ef6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..b664f0265e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..682008676e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html
index 083891dc3c1..07a0ea1b55e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..41b5ce92a97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..5e864962d56
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html
index f755d35c825..98b404fedf5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..602691c6934
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..bcf46902863
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html
index 55edfc93760..09b0fb76486 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..315750b51e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..482f2d065f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html
index 254a29152f8..3d372423afd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..0f2602a1be4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..067741bf3b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html
index 859c7267ad5..828ec64b0c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..cd27f9f08ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..f137640e965
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html
index 38edd1b85df..6b8948def66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <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="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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..8bc7ea6be68
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "strict-origin"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html
index 72eed78e5a2..0d808b1ec10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html
index 00587b4f18a..4aa3addd05e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html
index c1d52ddb514..4308e7df302 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html
index dca3d062994..38f6d7500e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..cd182a232ec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
index 5facb852896..ec1198bcc0a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..400dd8f0300
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..b8d2fe1eff8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
index e17dbf9ef6a..aeb7c9702db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..355d750427c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..0c0306301a6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html
index 387a0b3e6d5..856b8ff0fcb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..f7e1fe102b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..5d4eab98577
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html
index 54dab293d80..66f42ca5e1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..6628969062c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..2f416f3fadb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html
index 32dacf7ffdc..c12f4002576 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..0c946b2a60b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..6314ed0f057
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html
index ea9605e8169..e2222d539d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..bb6b70a0c6c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..7ab29972ddf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html
index c789cf6d302..67ea17399a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..2a9ed86d5bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..3755b7370c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html
index d5843c83a95..e8f21ee67f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..9647444b4b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..71e0dc4fbc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html
index 08f7d092894..e6acaf9d214 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..56c5e258b8d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..393dca701ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html
index 72cedc5e35c..bef4b5cc610 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..cdb432a486f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..4983b5c7cfd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html
index 2b06a9ab2a2..89ca7bdc259 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..7f982d17dfb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..cd5e5e64fe2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("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/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html
index eca04d52b02..9af25ed0534 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html
@@ -1,33 +1,36 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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.">
+    <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">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..e9f6ab0574d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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="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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": [
+            {
+              "deliveryType": "attr",
+              "key": "referrerPolicy",
+              "value": "unsafe-url"
+            }
+          ]
+        },
+        document.querySelector("meta[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.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..73a54d0606e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
index 917c0b88847..dde2dca8675 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..7d20b859bfc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..b229a783825
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
index 5e12002f256..bb946976c3f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..0447607c3ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..94abb2573bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
index 9ee1de48295..67aa90a0140 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..98d8a863608
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..082d28cf0ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
index dde31a65bfc..b8f5e9b2eee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..b8701fca1e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..852c48548e7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
index 6255a8d29cf..749f21239cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..bd25b6ae133
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..01a0db3b9c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
index 6941a3a73a3..b77f4d96275 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..2346b55d07a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..2e9fc5b2e8b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
index 9981baec4ba..f2becf509c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ce8e5fda9de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..519fcfd771f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
index c444cb95402..951519b578e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..db4fc07384c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index da358ee0e1c..5a755efbfca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index ef7dfd49fe4..8e678bcf1a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..aea6ad113b6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..30e3de6fa27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index be879a22314..1888eaa6e87 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..fda43b413b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..24d32babf89
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 9fa4ca3c127..13e10706165 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..9523eb75477
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ca6371b10a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index b44acdd3f3b..d331868bcbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..84b4a6ec83d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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.meta/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..45048211c2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
index 79c61faa417..8263463d658 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..b79ce484360
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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.meta/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..8b22c200cc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
index 0ada60ada71..b5c20489ea2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..b7a27ad4e1b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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.meta/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..112477d16f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
index 7d723ab86a1..d3435c8f8b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..b5cae623be9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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.meta/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..e12a76d5f51
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
index f27831c876c..5cae641dd90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..cd4cfbb4a2b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": [
+            {
+              "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/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
index 9ac2ca34857..6f244cf90b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
index 40c2b7a9ff8..fa464d4cd13 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
index b3424b1ea90..03f8d486cac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..bfbfa6a111f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
index b14908a7b2c..47a5b80e63a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..eda77bf2c21
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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.meta/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..e150b541724
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
index a38fcd1affa..08e7c2ac7b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..966e46aee14
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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.meta/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..20e1972f081
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index a205d415fa3..a833bd94bfb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
similarity index 59%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 9e03d5384e9..700d8b4a809 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..7f14039810a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..df937e909d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
similarity index 59%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 95d6345f7c4..96d97ac1472 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..3c4138b8589
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..c31e46e6329
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
similarity index 58%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 27c4c842c94..8f0780023de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..70f0b1d0478
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..36569eb9424
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
similarity index 58%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index d1f8677bc8b..c849230bf4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..d731596f4fe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..cbcc9e6295b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
index a94bdfa5d53..5bab0474686 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..0e04f73bfb6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..b85fd83fd01
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
index 7ba85fb790c..987252ef12a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..ab026fea16a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..91235039e7c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
index 0028b48d0b7..c539e7939c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..47e875fa08a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..107b56fac1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
index ada714dcc50..9374644959d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..d4116816fb4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": [
+            {
+              "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.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..128269f6f34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
index c6aafb2d306..43a090f1ea5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..c50f2a26657
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..7af9e18021d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
index 18fa571fbf2..3cbf28d1ef8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..364c09c82b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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.meta/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..67c68d77e78
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
index 289d7ee4ee5..21567b88c75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is 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.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..6cf498f4d04
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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.meta/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..95b69478ba2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
index 5c47aac9269..2915ef603c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -1,34 +1,35 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..f1ce7f4859a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "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.meta/unset/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
index a40088b5b67..777b6de1ef0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,34 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by 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="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
index 96f5f8c07a1..5d7b3c94250 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,34 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by 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="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
index 90eb85f1398..5e2e08f3a75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
@@ -1,33 +1,34 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by 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="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is 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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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.meta/unset/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
index 7f14e55c131..27e5f716b3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
@@ -1,33 +1,34 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by 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="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/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.meta/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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
similarity index 51%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
index 0cfaedb10bf..1290d4b8fa5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..d1f8d31f3a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "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.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..87bd5751b0c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "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.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..15212e5efd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "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.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..599115560f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "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.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..dc2e2c1dfb6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
similarity index 51%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
index 8a3731927e0..bf36678d942 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..b6e4f78ac0e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
similarity index 51%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
index d5275be0409..789d0834f9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="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.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ba4f236d0bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "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.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..bcce26cb8a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "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.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..7d1f847bfbe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer-when-downgrade"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..8e8157f1323
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..c787fab5c5f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..85ecd7925a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..3c2becf7698
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..5910e67c5b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..7c3936290ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..bfd6fca8711
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..a42e41721de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..d6e26a3f468
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..7fafb911930
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..3b173ad5f28
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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.meta/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..38058437bdb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "no-referrer"
+                }
+              ],
+              "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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
similarity index 51%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 5b7d1de44cc..0e6a44ac3a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..1117b4daacb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "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/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
similarity index 51%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index eb1c0191a3b..4fabfdaade3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..6c516602ca5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "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.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..a206e2ce9c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "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.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..6f8028c1dcc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "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.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..156377f90e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "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.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..a172b10f952
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
similarity index 51%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index fe7d67eac06..a7b1b7c91fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..d55c76f8881
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "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.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..041b67e7110
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "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.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..c08cabc857b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin-when-cross-origin"
+                }
+              ],
+              "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/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
similarity index 50%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
index 4fe3af9ffd3..7bfd0d5a840 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..de704bc0943
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "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.meta/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..ca55f436c55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "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.meta/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..e3219a49da2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "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.meta/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..a8f3516ebf5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "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.meta/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..ba9489b6a34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "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/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
similarity index 50%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
index 2ea65da273e..c077a8d1811 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ef739c129dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "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/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
similarity index 50%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
index 79c96e6f2b4..e8c08f0bb88 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..62c9e7d2b72
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "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.meta/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..46630082600
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "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.meta/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..8188643ee01
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "origin"
+                }
+              ],
+              "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/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
similarity index 50%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
index 2cbb6fd3489..018c62b91e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..9597e24bdee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "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.meta/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..5e2643d7fde
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "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.meta/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..01dd5f805c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "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.meta/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..6a182a3108f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "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.meta/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..0bb3681fc97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "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.meta/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..9440f4f487f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "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.meta/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..8abdf4c327c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "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/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
similarity index 50%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
index a1e4d2d8adc..ab275ebc172 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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="The referrer URL is omitted 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.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..937b8b13d55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "same-origin"
+                }
+              ],
+              "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index ebf8d26f517..1cf47d54894 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..5c3d5e225fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 42492e23b77..8f56a7b0441 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..2df7ef69811
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "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.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..d45c07219b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "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.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..c888bc339ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "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.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..529912b2e58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "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.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..0ac61caf3a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
similarity index 53%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index e28acbe9429..e1ff0869a51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..93b50e5f773
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "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.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..a63dbafca91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "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.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..841b0d9e6ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin-when-cross-origin"
+                }
+              ],
+              "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/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
similarity index 51%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
index 3955b78f7ac..aa408aa6ce5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..736d6725afa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "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.meta/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..d5513b4dd05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "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.meta/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..82f0a1388ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "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.meta/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..a72cc35cfce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "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.meta/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..34af6d0fc7f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "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/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
similarity index 51%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
index fc07b47fd64..625fd8cd628 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..78c721601ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "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/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
similarity index 51%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
index 07601e37eb0..03933e69756 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -1,33 +1,41 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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="The referrer URL is origin 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.">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
           "subresource": "img-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..9175e7684c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "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.meta/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..0795eb4161e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "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.meta/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..42dd0f13701
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
+    <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": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "strict-origin"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..e97c1e5dca0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..631218d1148
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..b84afa1a439
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..4873ce43df2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..8b11a32e1b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..b6ba1e9cf87
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..edcf94103e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..8f0c2527505
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..e7f9688518b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..c5872b8530d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..e3adb45186d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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.meta/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..1ce7d0cf3fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
+    <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": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [
+                {
+                  "deliveryType": "meta",
+                  "key": "referrerPolicy",
+                  "value": "unsafe-url"
+                }
+              ],
+              "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/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..b3d2b544a9c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/insecure-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.headers
index f2152da955f..180358e691b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: no-referrer-when-downgrade
 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/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..9a007d0d84d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/upgrade-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.headers
index f2152da955f..180358e691b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: no-referrer-when-downgrade
 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/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c00e4c49481
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/insecure-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.headers
index f2152da955f..180358e691b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: no-referrer-when-downgrade
 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/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..7c74c41c237
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/upgrade-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.headers
index f2152da955f..180358e691b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: no-referrer-when-downgrade
 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/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..b25074cd916
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html.headers
index 9b531426e5a..b3b55087edb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: no-referrer
 Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..650c7619ec8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html.headers
index 9b531426e5a..b3b55087edb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: no-referrer
 Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..4a450355f01
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html.headers
index 9b531426e5a..b3b55087edb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: no-referrer
 Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..40511c7e2c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html.headers
index 9b531426e5a..b3b55087edb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: no-referrer
 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/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..b46e7be3a0b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/cross-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers
index 9ce1de38843..a15ea7c65c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: origin-when-cross-origin
 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/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..a0a310b7155
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/cross-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers
index 9ce1de38843..a15ea7c65c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: origin-when-cross-origin
 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/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..298a038279c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/same-origin-insecure.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers
index 9ce1de38843..a15ea7c65c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: origin-when-cross-origin
 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/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..758f12d5c44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/same-origin-upgrade.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers
index 9ce1de38843..a15ea7c65c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: origin-when-cross-origin
 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/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..4a20e9e4cc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html.headers
index 306a53536ac..ecff74b90dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..e7950f912dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html.headers
index 306a53536ac..ecff74b90dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..d33231cb38c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html.headers
index 306a53536ac..ecff74b90dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..b5626c7c0dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html.headers
index 306a53536ac..ecff74b90dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..ed9a28b65ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/cross-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html.headers
index 309da8091a9..be66cf93211 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: same-origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..754471a9cff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/cross-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html.headers
index 309da8091a9..be66cf93211 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: same-origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..0abb0a7d9c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/same-origin-insecure.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html.headers
index 309da8091a9..be66cf93211 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: same-origin
 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/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..904e587a6a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/cross-insecure.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers
index d74467b0af6..4cff1d12f82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: strict-origin-when-cross-origin
 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/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..cc8c914c025
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/upgrade-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers
index d74467b0af6..4cff1d12f82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: strict-origin-when-cross-origin
 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/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..010acee655a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/same-insecure.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers
index d74467b0af6..4cff1d12f82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: strict-origin-when-cross-origin
 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/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..2817325cfc5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/upgrade-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers
index d74467b0af6..4cff1d12f82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: strict-origin-when-cross-origin
 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/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..cb4f01f6c95
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/insecure-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html.headers
index 07af8e286fd..1c32fba5a1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: strict-origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..4885fbe1ff0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/upgrade-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html.headers
index 07af8e286fd..1c32fba5a1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: strict-origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..cc1c78f8beb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/insecure-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html.headers
index 07af8e286fd..1c32fba5a1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: strict-origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..d20d8611d74
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/upgrade-protocol.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html.headers
index 07af8e286fd..1c32fba5a1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: strict-origin
 Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..7b2775d373b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html.headers
index c67e5215843..c1d3fd1a0be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: unsafe-url
 Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..f3d2c9bdc33
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html.headers
index c67e5215843..c1d3fd1a0be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: unsafe-url
 Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..260ba29dbdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html.headers
index c67e5215843..c1d3fd1a0be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: unsafe-url
 Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..d676d8f2a31
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("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/a-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html.headers
index c67e5215843..c1d3fd1a0be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Referrer-Policy: unsafe-url
 Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html
index 155e9fb7bf2..ecec5f91755 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html
@@ -1,33 +1,29 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by 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="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html
index f22c4142335..b8e0cb2bc50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html
@@ -1,33 +1,29 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by 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="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html
index 698f15f58c1..f5ef3b71b5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html
@@ -1,33 +1,29 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by 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="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html
index 5f1e54d48db..5d78d3f8550 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html
@@ -1,33 +1,29 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by 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="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
index 6a5f3c4fcc5..9c8bd866dd3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
index 14d891c6ca0..847ff9e0748 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
index ebb93af5050..92daf1692d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
index 0f512823e8e..83b076cf361 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..644f9725974
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..33fea42d097
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..9141367a2a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..34f144f635c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..6e8c01be69e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..be46a6dc033
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..c752d40de5c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..3ef5e2da959
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..5c114376e21
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..973f18e57c5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..c920708a903
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..9f7674a5ad9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-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 img-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": "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/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html
index 96ac4f9de15..980bb085e4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html
index ba1fd4a4110..1a5d8286fb3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html
index 01179a3fab9..4f10b1e49b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html
index 80165257482..63a5ac61022 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..72d12ba1680
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..658b2f53058
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..f11d265a703
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..baec2579bb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..d42fae6dde1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..673ca124b11
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..a3bf29152e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..41054cea6db
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..c19243c1b2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..b0db7e1e47b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..8b4f9047258
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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.meta/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..fc4cb5066a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-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 img-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": "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/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index a709e40c51b..9f8d2dbd6ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index 7d128a216ef..4fa25d16dfb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index bfae1b4ce35..f4108e0c84c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index c9d64acd3ff..86178557018 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..ccf903ea825
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..7809937046f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..741d65f96b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..41aec2926ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..0a0854c5f00
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..2fde6cd1fc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..c31f94ce0ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..9f884f2b3d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..bbd05a14b6d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..8931fa10ea2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..d1da9e8df1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..44b1001f7ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-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 img-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": "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/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html
index 7599f2ff243..98deca71afd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html
index 8a7ede0d2dd..750ee7a261d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html
index f3608e17eb9..eefe1de9d79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html
index 60094d7f0ab..8774535db2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..31f315594f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..388e2e3d5ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..2060eb73e2a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..8cdd906fefb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..2ccf63de2a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..de0232f3093
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..e08f79fea32
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..4a2fe1989f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ba963ea8161
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..9828fb13d32
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..596648c9d81
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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.meta/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..57809ed969c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-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 img-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": "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/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html
index ed415758d06..d3aa1095784 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html
similarity index 56%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html
index b50c0b60db8..e0389bbed25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects omitted for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "omitted",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "omitted"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html
similarity index 55%
rename from tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html
index 6f2de0eeff1..0da42646625 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..3c17d1b5424
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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.meta/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..fcf85f8024c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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.meta/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..7879c9fd745
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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.meta/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..6649f29229b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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.meta/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..24c4a92ca76
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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.meta/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..21f7a5d12a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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.meta/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..67c0f860512
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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.meta/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..78405b3e0d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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.meta/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..1664af89ced
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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.meta/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..5961eb3873e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-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 img-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": "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/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
similarity index 59%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index d8ba3dd25db..9d8627a6295 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
similarity index 59%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index e2c794e2e27..13a8c401004 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
similarity index 58%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index 12a1bc66e0f..273581974f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
similarity index 58%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index 62b85068c20..cf8d9db6dd0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..0bc478bdb4a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..633f09a54d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..3cbbe679336
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..e27ce357548
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..4be0ccee2a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..067b138ef63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..c4dc2e35291
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..62e4fd74770
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ea104b04395
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..d9cda36fee0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..ff8d5d23377
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..1c8f979a86a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-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 img-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": "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/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html
index 335ff468d90..3ab858bf1d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html
index 597f4092c2f..678f6519c1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html
index 0e40587a040..31bfc72a141 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html
similarity index 57%
rename from tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html
index c43e52e9dfb..384b25eaad2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects origin for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
+          "expectation": "origin",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "origin"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..8a2a3d96af5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..9632ab1732e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..1cb17c098e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..792f7b6845d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..a2612949094
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..4371d890f86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..7bdc0eb973a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..faeed209898
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..5c2ec37a040
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..846d91961a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..207c13fa7cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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.meta/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..569d109410b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-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 img-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": "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/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html
index cc66c5cacd1..a77024c16c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html
index 1ed2a0198ca..988679e223c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html
index 82055a7d4a2..0bb2daf32a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
           "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html
similarity index 54%
rename from tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
rename to tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html
index 7b81605b86f..4a04e98eef9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html
@@ -1,34 +1,30 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by referrer-policy/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.">
-    <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 a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-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/referrer-policy-test-case.sub.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
-      ReferrerPolicyTestCase(
+      TestCase(
         {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
           "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
+          "source_context_list": [],
+          "source_scheme": "http",
           "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
+          "subresource_policy_deliveries": []
         },
         document.querySelector("meta[name=assert]").content,
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..e53473e72bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..900968e3f5a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..69c5fcd0cb7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..a1204da8726
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..3fa1e11ec5a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..c2d12d62cf4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..4ab2671a8d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..bcf0d8379f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..e476176f271
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..f7737b87716
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..73ba6d68d92
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..7602c523a44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-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 img-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": "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.meta/unset/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..ecec5f91755
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").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/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..b8e0cb2bc50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").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/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..f5ef3b71b5e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").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/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..5d78d3f8550
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-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 a-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": "a-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").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/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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.meta/unset/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/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.meta/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/generic/tools/__init__.py b/tests/wpt/web-platform-tests/referrer-policy/generic/tools/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/tools/clean.py b/tests/wpt/web-platform-tests/referrer-policy/generic/tools/clean.py
deleted file mode 100755
index 715e1d6ae4b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/tools/clean.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-
-import os, json
-from common_paths import *
-import spec_validator
-
-def rmtree(top):
-    top = os.path.abspath(top)
-    assert top != os.path.expanduser("~")
-    assert len(top) > len(os.path.expanduser("~"))
-    assert "web-platform-tests" in top
-    assert "referrer-policy" in top
-
-    for root, dirs, files in os.walk(top, topdown=False):
-        for name in files:
-            os.remove(os.path.join(root, name))
-        for name in dirs:
-            os.rmdir(os.path.join(root, name))
-
-    os.rmdir(top)
-
-def main():
-    spec_json = load_spec_json();
-    spec_validator.assert_valid_spec_json(spec_json)
-
-    for spec in spec_json['specification']:
-        generated_dir = os.path.join(spec_directory, spec["name"])
-        if (os.path.isdir(generated_dir)):
-            rmtree(generated_dir)
-
-    if (os.path.isfile(generated_spec_json_filename)):
-        os.remove(generated_spec_json_filename)
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/tools/regenerate b/tests/wpt/web-platform-tests/referrer-policy/generic/tools/regenerate
deleted file mode 100755
index e6bd63519b3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/tools/regenerate
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-python $DIR/clean.py && python $DIR/generate.py
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index cfc379c0534..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 8d108c74608..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 21ea496ca49..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index cdcc134dedf..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 61b962276bb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index ad75a53979d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index a060a3bcfe2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index deb4132ab08..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 1737e72548c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index c64034d2bbd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 4d0c946bd7a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 9c769ba10d9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 42665670f5b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index fa0accb2c06..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index e1b79bca805..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index ceeaba32d59..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index ea8dcab7c7d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 5aa80479004..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 8ffbd3a852c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 455efc4ae70..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 6b29a191efe..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "no-referrer-when-downgrade",
-          "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/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
deleted file mode 100644
index eedf34f796d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "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/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 7a78d49b641..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "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/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
deleted file mode 100644
index 0fc1d169c9a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "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/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 93479418ab5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "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/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index f6755e99add..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 1f0b254a2a1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 44b8145030a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 98d1e981204..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 7784873f7f3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index a00848a63ec..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index f4bdee5ce86..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 134f342965e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 8f5b1a70b21..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index d0e05376f09..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 74ed8a8903d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 37879ce158d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 7bab6eff28e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index ce4957f92f0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index d940fe023d5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index edb49e27f23..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index f48a0217588..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 8d4143e4ab9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 68547fdbb73..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 6f57c7c4b2b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 66660f05264..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index f5e38ddb803..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 20dfb8a3d66..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 4705a198887..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 66310f711b5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index d3a7d9627f3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 0816608f10f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index fde81606e41..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 930a9c1450c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index dbbc89ead38..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index a190ee17938..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 572d84007c9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.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 set to 'no-referrer'</title>
-    <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="The referrer URL is omitted 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": "no-referrer",
-          "delivery_method": "attr-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/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index c1a8a0a0bc2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-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 a-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": "a-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/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index e1a27e3fbae..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-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 a-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": "a-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/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index 121bfdfa468..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-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 a-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": "a-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/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index 3780ae41833..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-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 a-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": "a-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/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index a09e04cd22c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index c2a92aa157e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 33451710956..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 8d06c867b75..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index ec0a21e2db1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index b878f3839f2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 5072cbcf152..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index cf296add12b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/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.">
-    <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 img-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": "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/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 660496841a4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 58a3e67dfb7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 8b6ac65947c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 93e56189dfb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 0736088aa84..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index eb27059a957..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 911649a5d14..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 27cb0340e0f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 3b72cc842c9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 959d00137c0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "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/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 4c4ea0c52d5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "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/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index c6421476aef..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "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/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
deleted file mode 100644
index 8ede638ebbf..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index f8e8509b8c8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
deleted file mode 100644
index 88ab886b233..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 24ab142cfd7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
deleted file mode 100644
index 91d8a23ea5e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index bac54212f09..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "origin-when-cross-origin",
-          "delivery_method": "attr-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/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
deleted file mode 100644
index fe1ec67414d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "a-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/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
deleted file mode 100644
index d36ac614868..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "a-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/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
deleted file mode 100644
index f4db0be0e50..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "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/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
deleted file mode 100644
index e9125ad0682..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "a-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/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index f93f8399ef7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 6335b58a250..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 3d8e32017d1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index feec6a71fff..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 2986e09860f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
deleted file mode 100644
index 140fbb9684b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 95973ce7308..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 86f6a004c32..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index f3f701fd230..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 714a08bc7bd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 6e914683ee8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 4f8dadde3c4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 75eadba3d1e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 3b10e291d33..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index bbc4061c2d2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 47c51d9df66..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index ea15eec3189..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index c59ee9d340c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 51b9ba26564..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 39c65173264..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 9af146296a2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 547c19ff485..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 2623fe82db0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index fbfb700eb94..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 68a33b74a18..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 7992aa6e009..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 9c4011d2817..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 6d987fbcb52..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.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 set to 'origin'</title>
-    <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="The referrer URL is origin 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": "origin",
-          "delivery_method": "attr-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/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index 9fa486e6ef1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-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 a-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": "a-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/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index 40606039bed..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-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 a-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": "a-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/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index 669b174a081..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-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 a-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": "a-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/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index ed249742bfd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-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 a-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": "a-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/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 1a5ad9592d5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 17379055260..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 483a43cddb1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 44042cd5008..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index f2a25196f71..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 3c2117ec022..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index bde05c454fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index e04b8253413..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/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.">
-    <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 img-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": "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/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index c047ae9b3d2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 6c6bf43a24d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index dad6e7ec9af..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 1f7a8985a9e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index eaa417eca08..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 2d2c6d6d04b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index a294cba7c53..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 29598521aae..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "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/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 4e046873b80..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "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/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 1e54e3910e4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "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/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 9aeeff94ea2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 0b75d688875..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 2be11cbd75b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ /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 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.">
-    <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 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": "same-origin",
-          "delivery_method": "attr-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/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
deleted file mode 100644
index 5923bd66f21..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-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 a-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": "a-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/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
deleted file mode 100644
index 0bb7ff22833..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-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 a-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": "a-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/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
deleted file mode 100644
index 86ad248198c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "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/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 13b9d94f53e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 2ae690c53d9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
deleted file mode 100644
index 485c8784c69..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index f6a28d48c1c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
deleted file mode 100644
index f0d6cdbf00c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
deleted file mode 100644
index d3ee7cb684b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
deleted file mode 100644
index f09d000eb72..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
deleted file mode 100644
index 990f752a23d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
deleted file mode 100644
index 8e23ad41ded..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index e5c060c86b3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index e165003f6ea..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 9bcf3910c1e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index cd8c557f05d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index b38e3d4668b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
deleted file mode 100644
index 83b3601256f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
deleted file mode 100644
index bc6c1bfd1ea..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
deleted file mode 100644
index 6581ee64e4a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "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/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 382334bba5c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index db04cf7f5cc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index d35d0c25cc0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 117a3dcd2e9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index bfd21f6f15f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index b9d2ab53f9a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin-when-cross-origin",
-          "delivery_method": "attr-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/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
deleted file mode 100644
index 4dd11a19be9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "a-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/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 22f1f3bdc72..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "a-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/a-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
deleted file mode 100644
index 26ba5374576..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "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/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 2fe55648eeb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 a-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": "a-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/img-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
deleted file mode 100644
index 6f0993c8010..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
deleted file mode 100644
index 1a928cfec18..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 3e11ade1bcf..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index f28e884825e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
deleted file mode 100644
index 9acebe2f0b0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 4b94af4929c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 17f127f6036..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 0c34da119fc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index e1e6c13ea35..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 811265f11ce..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index f78fb878fff..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 4b238c0449d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index a798c85d6f5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 240a3c7f186..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 8d18e84cb76..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 95f4a17a2a7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index ed1b8c033be..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 143f3f7c87a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index ffc81902980..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 7ceb389b35b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index f3f5573b758..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 902fa3341a1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 331f865afb2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 0d7bdf20697..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 1360edbceff..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index f69c1341e09..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-referrer",
-          "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/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index e7ea376cd14..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 747c8e1059d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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.">
-    <link 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 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": "strict-origin",
-          "delivery_method": "attr-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/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
deleted file mode 100644
index 9aa77a78c63..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-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 a-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": "a-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/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 3877d5bce4f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-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 a-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": "a-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/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
deleted file mode 100644
index 3449a347dca..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-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 a-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": "a-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/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
deleted file mode 100644
index fb86bc5c45f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-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 a-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": "a-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/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 0fc489100e8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 8b2dea1cb62..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 41025c58578..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index a574b130411..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 3675e2391e4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 623f6a6e81a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 7c597fbcec5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index fe6b2b59b8b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-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 img-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": "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/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 3bcc6e82a70..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index e19734a542a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 72eef24fef5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index a24af8beb2d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index a2773bfb160..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 612d7b36280..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 2c5328ff25e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 9899e2f4e6b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 98a55358c7e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index f7d63a639ef..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index bcf8f70bbf7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 91d7ac0ab4d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 7a45e12f4f8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 8ed4f634005..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 70403fe5365..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 433f51b1431..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index b23ffd4b8e2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index f5bec43c8b2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 5225f28f850..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 613eac440b5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index dfc5328013a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 8b5e5cd9c0c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 0913d31a24f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index d8375c93426..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.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 set to 'unsafe-url'</title>
-    <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="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": "unsafe-url",
-          "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/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index 3353f707404..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-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 a-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": "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/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index 8d9b118d13f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-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 a-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": "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/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index 8dace833026..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-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 a-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": "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/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
deleted file mode 100644
index 1a03c3d9dde..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-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 a-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": "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/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index cc71a6ca689..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index bbfd11f31fe..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 6a28a4c5e54..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index c5367f0e3cb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index 07314409e95..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index 3e27d0de2aa..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
deleted file mode 100644
index a94a77be567..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
deleted file mode 100644
index e8314118acb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/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.">
-    <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 img-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": "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/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
deleted file mode 100644
index 989c847a5b9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ /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 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": "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/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index cf7b83ef20a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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": "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/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 8573cd5e8ee..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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": "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/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
deleted file mode 100644
index c9b99a6b841..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ /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 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": "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/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 0dcfaf49870..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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": "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/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 1c44e334cfd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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": "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/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
deleted file mode 100644
index 31ef2573890..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ /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 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": "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/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index bf7140a15d2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ /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 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": "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/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
deleted file mode 100644
index 763f6f02ee4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ /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 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": "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/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 0f7f92fa907..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ /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 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": "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/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 6242cbd961b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ /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 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": "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/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
deleted file mode 100644
index 74f43287d9b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ /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 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": "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/resources/chromium/sms_mock.js b/tests/wpt/web-platform-tests/resources/chromium/sms_mock.js
new file mode 100644
index 00000000000..a8cd81a5cef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/chromium/sms_mock.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const SmsProvider = (() => {
+
+  class MockSmsReceiver {
+
+    constructor() {
+      this.mojoReceiver_ = new blink.mojom.SmsReceiverReceiver(this);
+
+      this.interceptor_ = new MojoInterfaceInterceptor(
+          blink.mojom.SmsReceiver.$interfaceName)
+
+      this.interceptor_.oninterfacerequest = (e) => {
+        this.mojoReceiver_.$.bindHandle(e.handle);
+      }
+      this.interceptor_.start();
+
+      this.returnValues_ = {};
+    }
+
+    receive() {
+      let call = this.returnValues_.receive ?
+          this.returnValues_.receive.shift() : null;
+      if (!call) {
+        throw new Error("Unexpected call.");
+      }
+      return call();
+    }
+
+    pushReturnValuesForTesting(callName, value) {
+      this.returnValues_[callName] = this.returnValues_[callName] || [];
+      this.returnValues_[callName].push(value);
+      return this;
+    }
+
+  }
+
+  const mockSmsReceiver = new MockSmsReceiver();
+
+  class SmsProviderChromium {
+    constructor() {
+      Object.freeze(this); // Make it immutable.
+    }
+
+    pushReturnValuesForTesting(callName, callback) {
+      mockSmsReceiver.pushReturnValuesForTesting(callName, callback);
+    }
+  }
+
+  return SmsProviderChromium;
+})();
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html
index c73abc4c98c..8a567fd7a93 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html
@@ -1,79 +1,53 @@
 <!DOCTYPE html>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
-<body>
+
 <script>
 const worker = 'resources/fetch-event-within-sw-worker.js';
 
-function reset() {
-  for (const iframe of [...document.querySelectorAll('.test-iframe')]) {
-    iframe.remove();
-  }
-  return navigator.serviceWorker.getRegistrations().then(registrations => {
-    return Promise.all(registrations.map(r => r.unregister()));
-  }).then(() => caches.keys()).then(cacheKeys => {
-    return Promise.all(cacheKeys.map(c => caches.delete(c)));
-  });
+async function registerSwAndOpenFrame(t) {
+  const registration = await navigator.serviceWorker.register(
+      worker, { scope: 'resources/' });
+  t.add_cleanup(() => registration.unregister());
+  await wait_for_state(t, registration.installing, 'activated');
+
+  const frame = await with_iframe('resources/simple.html');
+  t.add_cleanup(() => frame.remove());
+  return frame;
 }
 
-add_completion_callback(reset);
-
-function regReady(reg) {
-  return new Promise((resolve, reject) => {
-    if (reg.active) {
-      resolve();
-      return;
-    }
-    const nextWorker = reg.waiting || reg.installing;
-
-    nextWorker.addEventListener('statechange', () => {
-      if (nextWorker.state == 'redundant') {
-        reject(Error(`Service worker failed to install`));
-        return;
-      }
-      if (nextWorker.state == 'activated') {
-        resolve();
-      }
-    });
-  });
+async function deleteCashes() {
+  const cacheKeys = await caches.keys();
+  await Promise.all(cacheKeys.map(c => caches.delete(c)));
 }
 
-function registerSwAndOpenFrame() {
-  return reset().then(() => navigator.serviceWorker.register(worker, { scope: 'resources/' }))
-    .then(reg => regReady(reg))
-    .then(() => with_iframe('resources/simple.html'));
-}
+promise_test(async t => {
+  t.add_cleanup(deleteCashes);
 
-promise_test(() => {
-  return registerSwAndOpenFrame().then(iframe => {
-    return Promise.all([
-      iframe.contentWindow.fetch('dummy.txt').then(r => r.text()),
-      iframe.contentWindow.caches.open('test')
-        .then(cache =>
-          cache.add('dummy.txt').then(() => cache.match('dummy.txt'))
-        ).then(response => {
-          if (!response) return 'cache match failed';
-          return response.text();
-        })
-    ])
-  }).then(([fetchText, cacheText]) => {
-    assert_equals(fetchText, 'intercepted', 'fetch intercepted');
-    assert_equals(cacheText, 'intercepted', 'cache.add intercepted');
-  });
+  const iframe = await registerSwAndOpenFrame(t);
+  const fetchText =
+      await iframe.contentWindow.fetch('dummy.txt').then(r => r.text());
+
+  const cache = await iframe.contentWindow.caches.open('test');
+  await cache.add('dummy.txt');
+
+  const response = await cache.match('dummy.txt');
+  const cacheText = await (response ? response.text() : 'cache match failed');
+  assert_equals(fetchText, 'intercepted', 'fetch intercepted');
+  assert_equals(cacheText, 'intercepted', 'cache.add intercepted');
 }, 'Service worker intercepts requests from window');
 
-promise_test(() => {
-  return registerSwAndOpenFrame().then(iframe => {
-    return Promise.all([
-      iframe.contentWindow.fetch('dummy.txt-inner-fetch').then(r => r.text()),
-      iframe.contentWindow.fetch('dummy.txt-inner-cache').then(r => r.text())
-    ])
-  }).then(([fetchText, cacheText]) => {
-    assert_equals(fetchText, 'Hello world\n', 'fetch within SW not intercepted');
-    assert_equals(cacheText, 'Hello world\n', 'cache.add within SW not intercepted');
-  });
-}, `Service worker does not intercept fetch/cache requests within service worker`);
+promise_test(async t => {
+  const iframe = await registerSwAndOpenFrame(t);
+  const [fetchText, cacheText] = await Promise.all([
+    iframe.contentWindow.fetch('dummy.txt-inner-fetch').then(r => r.text()),
+    iframe.contentWindow.fetch('dummy.txt-inner-cache').then(r => r.text())
+  ]);
+  assert_equals(fetchText, 'Hello world\n', 'fetch within SW not intercepted');
+  assert_equals(cacheText, 'Hello world\n',
+                'cache.add within SW not intercepted');
+}, 'Service worker does not intercept fetch/cache requests within service ' +
+   'worker');
 </script>
-</body>
diff --git a/tests/wpt/web-platform-tests/sms/interceptor.https.html b/tests/wpt/web-platform-tests/sms/interceptor.https.html
index 39b749b6d32..6da2d71c52a 100644
--- a/tests/wpt/web-platform-tests/sms/interceptor.https.html
+++ b/tests/wpt/web-platform-tests/sms/interceptor.https.html
@@ -10,7 +10,7 @@
 
  Usage:
 
- 1) Include <script src="./sms_provider.js"></script> in your test.
+ 1) Include <script src="./resources/helper.js"></script> in your test.
  2) Set expectations
   await expect(receive).andReturn(() => {
     // mock behavior
@@ -29,7 +29,7 @@
  - enum State {kSuccess, kTimeout}: allows you to mock success/failures.
 
   -->
-<script src="./sms_provider.js"></script>
+<script src="./resources/helper.js"></script>
 <script>
 'use strict';
 
diff --git a/tests/wpt/web-platform-tests/sms/resources/helper.js b/tests/wpt/web-platform-tests/sms/resources/helper.js
new file mode 100644
index 00000000000..d34d6db3a2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/sms/resources/helper.js
@@ -0,0 +1,66 @@
+'use strict';
+
+// These tests rely on the User Agent providing an implementation of
+// the sms retriever.
+//
+// In Chromium-based browsers this implementation is provided by a polyfill
+// in order to reduce the amount of test-only code shipped to users. To enable
+// these tests the browser must be run with these options:
+//
+//   --enable-blink-features=MojoJS,MojoJSTest
+
+const loadChromiumResources = async () => {
+  if (!window.MojoInterfaceInterceptor) {
+    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
+    // not present in the global namespace.
+    return;
+  }
+
+  const resources = [
+    '/gen/layout_test_data/mojo/public/js/mojo_bindings_lite.js',
+    '/gen/mojo/public/mojom/base/time.mojom-lite.js',
+    '/gen/third_party/blink/public/mojom/sms/sms_receiver.mojom-lite.js',
+    '/resources/chromium/sms_mock.js',
+  ];
+
+  await Promise.all(resources.map(path => {
+    const script = document.createElement('script');
+    script.src = path;
+    script.async = false;
+    const promise = new Promise((resolve, reject) => {
+      script.onload = resolve;
+      script.onerror = reject;
+    });
+    document.head.appendChild(script);
+    return promise;
+  }));
+
+  Status.kSuccess = blink.mojom.SmsStatus.kSuccess;
+  Status.kTimeout = blink.mojom.SmsStatus.kTimeout;
+  Status.kCancelled = blink.mojom.SmsStatus.kCancelled;
+};
+
+const Status = {};
+
+async function create_sms_provider() {
+  if (typeof SmsProvider === 'undefined') {
+    await loadChromiumResources();
+  }
+  if (typeof SmsProvider == 'undefined') {
+    throw new Error('Mojo testing interface is not available.');
+  }
+  return new SmsProvider();
+}
+
+function receive() {
+  throw new Error("expected to be overriden by tests");
+}
+
+function expect(call) {
+  return {
+    async andReturn(callback) {
+      const mock = await create_sms_provider();
+      mock.pushReturnValuesForTesting(call.name, callback);
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/sms/resources/iframe.html b/tests/wpt/web-platform-tests/sms/resources/iframe.html
index 9a00e84c63b..38efb15a748 100644
--- a/tests/wpt/web-platform-tests/sms/resources/iframe.html
+++ b/tests/wpt/web-platform-tests/sms/resources/iframe.html
@@ -1,8 +1,25 @@
+<script src="./helper.js"></script>
 <script>
 'use strict';
 
-navigator.sms.receive().catch(error => {
-  window.parent.postMessage({errorType: error.name}, '*');
-});
+// Intercept successful calls and return mocked value.
+(async function() {
+  await expect(receive).andReturn(() => {
+      return Promise.resolve({
+        status: Status.kSuccess,
+        message: "hello",
+      });
+  });
+}());
+
+window.onload = function() {
+  navigator.sms.receive()
+   .then(sms => {
+     window.parent.postMessage({result: "Pass", sms: sms.content}, '*');
+   })
+   .catch(error => {
+     window.parent.postMessage({result: "Fail", errorType: error.name}, '*');
+   });
+}
 
 </script>
diff --git a/tests/wpt/web-platform-tests/sms/sms-iframe.https.html b/tests/wpt/web-platform-tests/sms/sms-iframe.https.html
new file mode 100644
index 00000000000..0809f2426d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/sms/sms-iframe.https.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/get-host-info.sub.js"></script>
+
+<body>
+
+<script>
+'use strict';
+
+const host = get_host_info();
+const remoteBaseURL = host.HTTPS_REMOTE_ORIGIN + window.location.pathname.replace(/\/[^\/]*$/, '/') ;
+const localBaseURL = host.HTTPS_ORIGIN + window.location.pathname.replace(/\/[^\/]*$/, '/') ;
+
+promise_test(async t => {
+  const messageWatcher = new EventWatcher(t, window, "message");
+  var iframe = document.createElement("iframe");
+  iframe.src = localBaseURL + "resources/iframe.html";
+
+  document.body.appendChild(iframe);
+
+  const message = await messageWatcher.wait_for("message");
+  assert_equals(message.data.result, "Pass");
+  assert_equals(message.data.sms, "hello");
+
+}, "Test SMSReceiver API enabled in same origin iframes");
+
+promise_test(async t => {
+  const messageWatcher = new EventWatcher(t, window, "message");
+  var iframe = document.createElement("iframe");
+  iframe.src = remoteBaseURL + "resources/iframe.html"
+  document.body.appendChild(iframe);
+
+  const message = await messageWatcher.wait_for("message");
+  assert_equals(message.data.result, "Fail");
+  assert_equals(message.data.errorType, "NotAllowedError");
+
+}, "Test SMSReceiver API disabled in cross origin iframes");
+
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/sms/sms-top-level-frame-only.https.html b/tests/wpt/web-platform-tests/sms/sms-top-level-frame-only.https.html
deleted file mode 100644
index ba6374e85b3..00000000000
--- a/tests/wpt/web-platform-tests/sms/sms-top-level-frame-only.https.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<body>
-
-<script>
-'use strict';
-
-promise_test(async t => {
-  const messageWatcher = new EventWatcher(t, window, "message");
-  var iframe = document.createElement("iframe");
-  iframe.src = "resources/iframe.html"
-  document.body.appendChild(iframe);
-
-  const message = await messageWatcher.wait_for("message");
-  assert_equals(message.data.errorType, "NotAllowedError");
-
-}, "Test SMSReceiver API disabled in iframes");
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/sms/sms_provider.js b/tests/wpt/web-platform-tests/sms/sms_provider.js
deleted file mode 100644
index 11fd8466e98..00000000000
--- a/tests/wpt/web-platform-tests/sms/sms_provider.js
+++ /dev/null
@@ -1,79 +0,0 @@
-let interceptor = (async function() {
-  let load = Promise.resolve();
-  [
-    '/gen/layout_test_data/mojo/public/js/mojo_bindings_lite.js',
-    '/gen/mojo/public/mojom/base/big_buffer.mojom-lite.js',
-    '/gen/mojo/public/mojom/base/string16.mojom-lite.js',
-    '/gen/mojo/public/mojom/base/time.mojom-lite.js',
-    '/gen/third_party/blink/public/mojom/sms/sms_receiver.mojom-lite.js',
-  ].forEach(path => {
-    let script = document.createElement('script');
-    script.src = path;
-    script.async = false;
-    load = load.then(() => new Promise(resolve => {
-      script.onload = resolve;
-    }));
-    document.head.appendChild(script);
-  });
-
-  return load.then(intercept);
-})();
-
-// Fake implementation of blink.mojom.SmsReceiver.
-class FakeSmsReceiverImpl {
-  constructor() {
-    this.returnValues = {}
-  }
-
-  bindHandleToMojoReceiver(handle) {
-    this.mojoReceiver_ = new blink.mojom.SmsReceiverReceiver(this);
-    this.mojoReceiver_.$.bindHandle(handle);
-  }
-
-  pushReturnValuesForTesting(callName, returnValues) {
-    this.returnValues[callName] = this.returnValues[callName] || [];
-    this.returnValues[callName].push(returnValues);
-    return this;
-  }
-
-  receive() {
-    let call = this.returnValues.receive.shift();
-    if (!call) {
-      throw new Error("Unexpected call.");
-    }
-    return call();
-  }
-}
-
-function receive(callback) {
-  throw new Error("expected to be overriden by tests");
-}
-
-function expect(call) {
-  return {
-    async andReturn(callback) {
-      let smsReceiverImpl = await interceptor;
-      smsReceiverImpl.pushReturnValuesForTesting(call.name, callback);
-    }
-  }
-}
-
-const Status = {};
-
-function intercept() {
-  let smsReceiverImpl = new FakeSmsReceiverImpl();
-
-  let interceptor = new MojoInterfaceInterceptor(
-      blink.mojom.SmsReceiver.$interfaceName);
-  interceptor.oninterfacerequest = (e) => {
-    smsReceiverImpl.bindHandleToMojoReceiver(e.handle);
-  }
-
-  interceptor.start();
-
-  Status.kSuccess = blink.mojom.SmsStatus.kSuccess;
-  Status.kTimeout = blink.mojom.SmsStatus.kTimeout;
-  Status.kCancelled = blink.mojom.SmsStatus.kCancelled;
-
-  return smsReceiverImpl;
-}
diff --git a/tests/wpt/web-platform-tests/svg/animations/beginevents-1.html b/tests/wpt/web-platform-tests/svg/animations/beginevents-1.html
new file mode 100644
index 00000000000..92debaf82a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/beginevents-1.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>beginEvent dispatching</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<svg>
+  <rect width="100" height="100" fill="red">
+    <animate begin="click" dur="10ms" fill="freeze"
+             attributeName="fill" from="red" to="blue"/>
+  </rect>
+</svg>
+<script>
+  async_test(t => {
+    window.onload = t.step_func(() => {
+      let rect = document.querySelector("svg > rect");
+      let animate = rect.firstElementChild;
+      let beginEventCount = 0;
+      animate.addEventListener('beginEvent', t.step_func(() => {
+        beginEventCount++;
+      }));
+      animate.addEventListener('endEvent', t.step_func_done(() => {
+        assert_equals(beginEventCount, 1);
+      }));
+      rect.dispatchEvent(new Event("click"));
+    });
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/ci/run_tc.py b/tests/wpt/web-platform-tests/tools/ci/run_tc.py
index 240517a1ff6..e54f431955a 100755
--- a/tests/wpt/web-platform-tests/tools/ci/run_tc.py
+++ b/tests/wpt/web-platform-tests/tools/ci/run_tc.py
@@ -150,7 +150,7 @@ def start_xvfb():
 def get_extra_jobs(event):
     body = None
     jobs = set()
-    if "commits" in event:
+    if "commits" in event and event["commits"]:
         body = event["commits"][0]["message"]
     elif "pull_request" in event:
         body = event["pull_request"]["body"]
diff --git a/tests/wpt/web-platform-tests/tools/docker/Dockerfile b/tests/wpt/web-platform-tests/tools/docker/Dockerfile
index e60b4ea6a3a..3d41834cfb4 100644
--- a/tests/wpt/web-platform-tests/tools/docker/Dockerfile
+++ b/tests/wpt/web-platform-tests/tools/docker/Dockerfile
@@ -7,6 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
 # General requirements not in the base image
 RUN apt-get -qqy update \
   && apt-get -qqy install \
+    bridge-utils \
     bzip2 \
     ca-certificates \
     dbus-x11 \
@@ -14,10 +15,14 @@ RUN apt-get -qqy update \
     fluxbox \
     gdebi \
     git \
+    libvirt-daemon-system \
+    libvirt-clients \
     locales \
+    openjdk-8-jre-headless \
     pulseaudio \
     python \
     python-pip \
+    qemu-kvm \
     tzdata \
     sudo \
     unzip \
@@ -39,6 +44,8 @@ RUN apt-get -qqy install \
     libindicator3-7 \
     libindicator7
 
+RUN apt-get -y autoremove
+
 RUN pip install --upgrade pip
 RUN pip install virtualenv
 
@@ -56,6 +63,8 @@ RUN useradd test \
          --shell /bin/bash  \
          --create-home \
   && usermod -a -G sudo test \
+  && usermod -a -G libvirt test \
+  && usermod -a -G libvirt-qemu test \
   && echo 'ALL ALL = (ALL) NOPASSWD: ALL' >> /etc/sudoers \
   && echo 'test:secret' | chpasswd
 
diff --git a/tests/wpt/web-platform-tests/tools/docker/start.sh b/tests/wpt/web-platform-tests/tools/docker/start.sh
index dbeeed41c14..2e5f69d4071 100755
--- a/tests/wpt/web-platform-tests/tools/docker/start.sh
+++ b/tests/wpt/web-platform-tests/tools/docker/start.sh
@@ -17,6 +17,14 @@ REF=${2:-master}
 
 cd ~
 
+if [ -e /dev/kvm ]; then
+    # If kvm is present ensure that the test user can access it
+    # Ideally this could be done by adding the test user to the
+    # owning group, but then we need to re-login to evaluate the
+    # group membership. This chmod doesn't affect the host.
+    sudo chmod a+rw /dev/kvm
+fi
+
 if [ ! -d web-platform-tests ]; then
     mkdir web-platform-tests
     cd web-platform-tests
diff --git a/tests/wpt/web-platform-tests/tools/runner/runner.css b/tests/wpt/web-platform-tests/tools/runner/runner.css
index 85460177ea1..ec72acb83e7 100644
--- a/tests/wpt/web-platform-tests/tools/runner/runner.css
+++ b/tests/wpt/web-platform-tests/tools/runner/runner.css
@@ -52,7 +52,6 @@ section ol {
 }
 
 html.done section ol {
-    -moz-column-count: 3;
     -webkit-column-count: 3;
     column-count: 3;
 }
diff --git a/tests/wpt/web-platform-tests/tools/third_party/tooltool/tooltool.py b/tests/wpt/web-platform-tests/tools/third_party/tooltool/tooltool.py
new file mode 100755
index 00000000000..53929fce880
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/tooltool/tooltool.py
@@ -0,0 +1,1316 @@
+#!/usr/bin/env python
+
+# tooltool is a lookaside cache implemented in Python
+# Copyright (C) 2011 John H. Ford <john@johnford.info>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation version 2
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# A manifest file specifies files in that directory that are stored
+# elsewhere. This file should only list files in the same directory
+# in which the manifest file resides and it should be called
+# 'manifest.tt'
+
+from __future__ import print_function
+
+import base64
+import calendar
+import hashlib
+import hmac
+import json
+import logging
+import math
+import optparse
+import os
+import pprint
+import re
+import shutil
+import sys
+import tarfile
+import tempfile
+import threading
+import time
+import zipfile
+
+from io import open
+from io import BytesIO
+from subprocess import PIPE
+from subprocess import Popen
+
+__version__ = '1'
+
+# Allowed request header characters:
+# !#$%&'()*+,-./:;<=>?@[]^_`{|}~ and space, a-z, A-Z, 0-9, \, "
+REQUEST_HEADER_ATTRIBUTE_CHARS = re.compile(
+    r"^[ a-zA-Z0-9_\!#\$%&'\(\)\*\+,\-\./\:;<\=>\?@\[\]\^`\{\|\}~]*$")
+DEFAULT_MANIFEST_NAME = 'manifest.tt'
+TOOLTOOL_PACKAGE_SUFFIX = '.TOOLTOOL-PACKAGE'
+HAWK_VER = 1
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    open_attrs = dict(mode='w', encoding='utf-8')
+    six_binary_type = bytes
+    six_text_type = str
+    unicode = str  # Silence `pyflakes` from reporting `undefined name 'unicode'` in Python 3.
+    import urllib.request as urllib2
+    from http.client import HTTPSConnection, HTTPConnection
+    from urllib.parse import urlparse, urljoin
+    from urllib.request import Request
+    from urllib.error import HTTPError, URLError
+else:
+    open_attrs = dict(mode='wb')
+    six_binary_type = str
+    six_text_type = unicode
+    import urllib2
+    from httplib import HTTPSConnection, HTTPConnection
+    from urllib2 import Request, HTTPError, URLError
+    from urlparse import urlparse, urljoin
+
+
+log = logging.getLogger(__name__)
+
+
+def request_has_data(req):
+    if PY3:
+        return req.data is not None
+    return req.has_data()
+
+
+def to_binary(val):
+    if isinstance(val, six_text_type):
+        return val.encode('utf-8')
+    return val
+
+
+def to_text(val):
+    if isinstance(val, six_binary_type):
+        return val.decode('utf-8')
+    return val
+
+
+def get_hexdigest(val):
+    return hashlib.sha512(to_binary(val)).hexdigest()
+
+
+class FileRecordJSONEncoderException(Exception):
+    pass
+
+
+class InvalidManifest(Exception):
+    pass
+
+
+class ExceptionWithFilename(Exception):
+
+    def __init__(self, filename):
+        Exception.__init__(self)
+        self.filename = filename
+
+
+class BadFilenameException(ExceptionWithFilename):
+    pass
+
+
+class DigestMismatchException(ExceptionWithFilename):
+    pass
+
+
+class MissingFileException(ExceptionWithFilename):
+    pass
+
+
+class InvalidCredentials(Exception):
+    pass
+
+
+class BadHeaderValue(Exception):
+    pass
+
+
+def parse_url(url):
+    url_parts = urlparse(url)
+    url_dict = {
+        'scheme': url_parts.scheme,
+        'hostname': url_parts.hostname,
+        'port': url_parts.port,
+        'path': url_parts.path,
+        'resource': url_parts.path,
+        'query': url_parts.query,
+    }
+    if len(url_dict['query']) > 0:
+        url_dict['resource'] = '%s?%s' % (url_dict['resource'],  # pragma: no cover
+                                          url_dict['query'])
+
+    if url_parts.port is None:
+        if url_parts.scheme == 'http':
+            url_dict['port'] = 80
+        elif url_parts.scheme == 'https':  # pragma: no cover
+            url_dict['port'] = 443
+    return url_dict
+
+
+def utc_now(offset_in_seconds=0.0):
+    return int(math.floor(calendar.timegm(time.gmtime()) + float(offset_in_seconds)))
+
+
+def random_string(length):
+    return base64.urlsafe_b64encode(os.urandom(length))[:length]
+
+
+def prepare_header_val(val):
+    if isinstance(val, six_binary_type):
+        val = val.decode('utf-8')
+
+    if not REQUEST_HEADER_ATTRIBUTE_CHARS.match(val):
+        raise BadHeaderValue(  # pragma: no cover
+            'header value value={val} contained an illegal character'.format(val=repr(val)))
+
+    return val
+
+
+def parse_content_type(content_type):  # pragma: no cover
+    if content_type:
+        return content_type.split(';')[0].strip().lower()
+    else:
+        return ''
+
+
+def calculate_payload_hash(algorithm, payload, content_type):  # pragma: no cover
+    parts = [
+        part if isinstance(part, six_binary_type) else part.encode('utf8')
+        for part in ['hawk.' + str(HAWK_VER) + '.payload\n',
+                     parse_content_type(content_type) + '\n',
+                     payload or '',
+                     '\n',
+                     ]
+    ]
+
+    p_hash = hashlib.new(algorithm)
+    p_hash.update(''.join(parts))
+
+    log.debug('calculating payload hash from:\n{parts}'.format(parts=pprint.pformat(parts)))
+
+    return base64.b64encode(p_hash.digest())
+
+
+def validate_taskcluster_credentials(credentials):
+    if not hasattr(credentials, '__getitem__'):
+        raise InvalidCredentials('credentials must be a dict-like object')  # pragma: no cover
+    try:
+        credentials['clientId']
+        credentials['accessToken']
+    except KeyError:  # pragma: no cover
+        etype, val, tb = sys.exc_info()
+        raise InvalidCredentials('{etype}: {val}'.format(etype=etype, val=val))
+
+
+def normalize_header_attr(val):
+    if isinstance(val, six_binary_type):
+        return val.decode('utf-8')
+    return val  # pragma: no cover
+
+
+def normalize_string(mac_type,
+                     timestamp,
+                     nonce,
+                     method,
+                     name,
+                     host,
+                     port,
+                     content_hash,
+                     ):
+    return '\n'.join([
+        normalize_header_attr(header)
+        # The blank lines are important. They follow what the Node Hawk lib does.
+        for header in ['hawk.' + str(HAWK_VER) + '.' + mac_type,
+                       timestamp,
+                       nonce,
+                       method or '',
+                       name or '',
+                       host,
+                       port,
+                       content_hash or '',
+                       '',  # for ext which is empty in this case
+                       '',  # Add trailing new line.
+                       ]
+    ])
+
+
+def calculate_mac(mac_type,
+                  access_token,
+                  algorithm,
+                  timestamp,
+                  nonce,
+                  method,
+                  name,
+                  host,
+                  port,
+                  content_hash,
+                  ):
+    normalized = normalize_string(mac_type,
+                                  timestamp,
+                                  nonce,
+                                  method,
+                                  name,
+                                  host,
+                                  port,
+                                  content_hash)
+    log.debug(u'normalized resource for mac calc: {norm}'.format(norm=normalized))
+    digestmod = getattr(hashlib, algorithm)
+
+    if not isinstance(normalized, six_binary_type):
+        normalized = normalized.encode('utf8')
+
+    if not isinstance(access_token, six_binary_type):
+        access_token = access_token.encode('ascii')
+
+    result = hmac.new(access_token, normalized, digestmod)
+    return base64.b64encode(result.digest())
+
+
+def make_taskcluster_header(credentials, req):
+    validate_taskcluster_credentials(credentials)
+
+    url = req.get_full_url()
+    method = req.get_method()
+    algorithm = 'sha256'
+    timestamp = str(utc_now())
+    nonce = random_string(6)
+    url_parts = parse_url(url)
+
+    content_hash = None
+    if request_has_data(req):
+        content_hash = calculate_payload_hash(  # pragma: no cover
+            algorithm,
+            req.get_data(),
+            # maybe we should detect this from req.headers but we anyway expect json
+            content_type='application/json',
+        )
+
+    mac = calculate_mac('header',
+                        credentials['accessToken'],
+                        algorithm,
+                        timestamp,
+                        nonce,
+                        method,
+                        url_parts['resource'],
+                        url_parts['hostname'],
+                        str(url_parts['port']),
+                        content_hash,
+                        )
+
+    header = u'Hawk mac="{}"'.format(prepare_header_val(mac))
+
+    if content_hash:  # pragma: no cover
+        header = u'{}, hash="{}"'.format(header, prepare_header_val(content_hash))
+
+    header = u'{header}, id="{id}", ts="{ts}", nonce="{nonce}"'.format(
+        header=header,
+        id=prepare_header_val(credentials['clientId']),
+        ts=prepare_header_val(timestamp),
+        nonce=prepare_header_val(nonce),
+    )
+
+    log.debug('Hawk header for URL={} method={}: {}'.format(url, method, header))
+
+    return header
+
+
+class FileRecord(object):
+
+    def __init__(self, filename, size, digest, algorithm, unpack=False,
+                 version=None, visibility=None):
+        object.__init__(self)
+        if '/' in filename or '\\' in filename:
+            log.error(
+                "The filename provided contains path information and is, therefore, invalid.")
+            raise BadFilenameException(filename=filename)
+        self.filename = filename
+        self.size = size
+        self.digest = digest
+        self.algorithm = algorithm
+        self.unpack = unpack
+        self.version = version
+        self.visibility = visibility
+
+    def __eq__(self, other):
+        if self is other:
+            return True
+        if self.filename == other.filename and \
+           self.size == other.size and \
+           self.digest == other.digest and \
+           self.algorithm == other.algorithm and \
+           self.version == other.version and \
+           self.visibility == other.visibility:
+            return True
+        else:
+            return False
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __str__(self):
+        return repr(self)
+
+    def __repr__(self):
+        return "%s.%s(filename='%s', size=%s, digest='%s', algorithm='%s', visibility=%r)" % (
+            __name__, self.__class__.__name__, self.filename, self.size,
+            self.digest, self.algorithm, self.visibility)
+
+    def present(self):
+        # Doesn't check validity
+        return os.path.exists(self.filename)
+
+    def validate_size(self):
+        if self.present():
+            return self.size == os.path.getsize(self.filename)
+        else:
+            log.debug(
+                "trying to validate size on a missing file, %s", self.filename)
+            raise MissingFileException(filename=self.filename)
+
+    def validate_digest(self):
+        if self.present():
+            with open(self.filename, 'rb') as f:
+                return self.digest == digest_file(f, self.algorithm)
+        else:
+            log.debug(
+                "trying to validate digest on a missing file, %s', self.filename")
+            raise MissingFileException(filename=self.filename)
+
+    def validate(self):
+        if self.size is None or self.validate_size():
+            if self.validate_digest():
+                return True
+        return False
+
+    def describe(self):
+        if self.present() and self.validate():
+            return "'%s' is present and valid" % self.filename
+        elif self.present():
+            return "'%s' is present and invalid" % self.filename
+        else:
+            return "'%s' is absent" % self.filename
+
+
+def create_file_record(filename, algorithm):
+    fo = open(filename, 'rb')
+    stored_filename = os.path.split(filename)[1]
+    fr = FileRecord(stored_filename, os.path.getsize(
+        filename), digest_file(fo, algorithm), algorithm)
+    fo.close()
+    return fr
+
+
+class FileRecordJSONEncoder(json.JSONEncoder):
+
+    def encode_file_record(self, obj):
+        if not issubclass(type(obj), FileRecord):
+            err = "FileRecordJSONEncoder is only for FileRecord and lists of FileRecords, " \
+                  "not %s" % obj.__class__.__name__
+            log.warn(err)
+            raise FileRecordJSONEncoderException(err)
+        else:
+            rv = {
+                'filename': obj.filename,
+                'size': obj.size,
+                'algorithm': obj.algorithm,
+                'digest': obj.digest,
+            }
+            if obj.unpack:
+                rv['unpack'] = True
+            if obj.version:
+                rv['version'] = obj.version
+            if obj.visibility is not None:
+                rv['visibility'] = obj.visibility
+            return rv
+
+    def default(self, f):
+        if issubclass(type(f), list):
+            record_list = []
+            for i in f:
+                record_list.append(self.encode_file_record(i))
+            return record_list
+        else:
+            return self.encode_file_record(f)
+
+
+class FileRecordJSONDecoder(json.JSONDecoder):
+
+    """I help the json module materialize a FileRecord from
+    a JSON file.  I understand FileRecords and lists of
+    FileRecords.  I ignore things that I don't expect for now"""
+    # TODO: make this more explicit in what it's looking for
+    # and error out on unexpected things
+
+    def process_file_records(self, obj):
+        if isinstance(obj, list):
+            record_list = []
+            for i in obj:
+                record = self.process_file_records(i)
+                if issubclass(type(record), FileRecord):
+                    record_list.append(record)
+            return record_list
+        required_fields = [
+            'filename',
+            'size',
+            'algorithm',
+            'digest',
+        ]
+        if isinstance(obj, dict):
+            missing = False
+            for req in required_fields:
+                if req not in obj:
+                    missing = True
+                    break
+
+            if not missing:
+                unpack = obj.get('unpack', False)
+                version = obj.get('version', None)
+                visibility = obj.get('visibility', None)
+                rv = FileRecord(
+                    obj['filename'], obj['size'], obj['digest'], obj['algorithm'],
+                    unpack, version, visibility)
+                log.debug("materialized %s" % rv)
+                return rv
+        return obj
+
+    def decode(self, s):
+        decoded = json.JSONDecoder.decode(self, s)
+        rv = self.process_file_records(decoded)
+        return rv
+
+
+class Manifest(object):
+
+    valid_formats = ('json',)
+
+    def __init__(self, file_records=None):
+        self.file_records = file_records or []
+
+    def __eq__(self, other):
+        if self is other:
+            return True
+        if len(self.file_records) != len(other.file_records):
+            log.debug('Manifests differ in number of files')
+            return False
+        # sort the file records by filename before comparing
+        mine = sorted((fr.filename, fr) for fr in self.file_records)
+        theirs = sorted((fr.filename, fr) for fr in other.file_records)
+        return mine == theirs
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __deepcopy__(self, memo):
+        # This is required for a deep copy
+        return Manifest(self.file_records[:])
+
+    def __copy__(self):
+        return Manifest(self.file_records)
+
+    def copy(self):
+        return Manifest(self.file_records[:])
+
+    def present(self):
+        return all(i.present() for i in self.file_records)
+
+    def validate_sizes(self):
+        return all(i.validate_size() for i in self.file_records)
+
+    def validate_digests(self):
+        return all(i.validate_digest() for i in self.file_records)
+
+    def validate(self):
+        return all(i.validate() for i in self.file_records)
+
+    def load(self, data_file, fmt='json'):
+        assert fmt in self.valid_formats
+        if fmt == 'json':
+            try:
+                self.file_records.extend(
+                    json.load(data_file, cls=FileRecordJSONDecoder))
+            except ValueError:
+                raise InvalidManifest("trying to read invalid manifest file")
+
+    def loads(self, data_string, fmt='json'):
+        assert fmt in self.valid_formats
+        if fmt == 'json':
+            try:
+                self.file_records.extend(
+                    json.loads(data_string, cls=FileRecordJSONDecoder))
+            except ValueError:
+                raise InvalidManifest("trying to read invalid manifest file")
+
+    def dump(self, output_file, fmt='json'):
+        assert fmt in self.valid_formats
+        if fmt == 'json':
+            return json.dump(
+                self.file_records, output_file,
+                indent=2, separators=(',', ': '),
+                cls=FileRecordJSONEncoder,
+            )
+
+    def dumps(self, fmt='json'):
+        assert fmt in self.valid_formats
+        if fmt == 'json':
+            return json.dumps(
+                self.file_records,
+                indent=2, separators=(',', ': '),
+                cls=FileRecordJSONEncoder,
+            )
+
+
+def digest_file(f, a):
+    """I take a file like object 'f' and return a hex-string containing
+    of the result of the algorithm 'a' applied to 'f'."""
+    h = hashlib.new(a)
+    chunk_size = 1024 * 10
+    data = f.read(chunk_size)
+    while data:
+        h.update(data)
+        data = f.read(chunk_size)
+    name = repr(f.name) if hasattr(f, 'name') else 'a file'
+    log.debug('hashed %s with %s to be %s', name, a, h.hexdigest())
+    return h.hexdigest()
+
+
+def execute(cmd):
+    """Execute CMD, logging its stdout at the info level"""
+    process = Popen(cmd, shell=True, stdout=PIPE)
+    while True:
+        line = process.stdout.readline()
+        if not line:
+            break
+        log.info(line.replace('\n', ' '))
+    return process.wait() == 0
+
+
+def open_manifest(manifest_file):
+    """I know how to take a filename and load it into a Manifest object"""
+    if os.path.exists(manifest_file):
+        manifest = Manifest()
+        with open(manifest_file, "rb") as f:
+            manifest.load(f)
+            log.debug("loaded manifest from file '%s'" % manifest_file)
+        return manifest
+    else:
+        log.debug("tried to load absent file '%s' as manifest" % manifest_file)
+        raise InvalidManifest(
+            "manifest file '%s' does not exist" % manifest_file)
+
+
+def list_manifest(manifest_file):
+    """I know how print all the files in a location"""
+    try:
+        manifest = open_manifest(manifest_file)
+    except InvalidManifest as e:
+        log.error("failed to load manifest file at '%s': %s" % (
+            manifest_file,
+            str(e),
+        ))
+        return False
+    for f in manifest.file_records:
+        print("{}\t{}\t{}".format("P" if f.present() else "-",
+                                  "V" if f.present() and f.validate() else "-",
+                                  f.filename))
+    return True
+
+
+def validate_manifest(manifest_file):
+    """I validate that all files in a manifest are present and valid but
+    don't fetch or delete them if they aren't"""
+    try:
+        manifest = open_manifest(manifest_file)
+    except InvalidManifest as e:
+        log.error("failed to load manifest file at '%s': %s" % (
+            manifest_file,
+            str(e),
+        ))
+        return False
+    invalid_files = []
+    absent_files = []
+    for f in manifest.file_records:
+        if not f.present():
+            absent_files.append(f)
+        else:
+            if not f.validate():
+                invalid_files.append(f)
+    if len(invalid_files + absent_files) == 0:
+        return True
+    else:
+        return False
+
+
+def add_files(manifest_file, algorithm, filenames, version, visibility, unpack):
+    # returns True if all files successfully added, False if not
+    # and doesn't catch library Exceptions.  If any files are already
+    # tracked in the manifest, return will be False because they weren't
+    # added
+    all_files_added = True
+    # Create a old_manifest object to add to
+    if os.path.exists(manifest_file):
+        old_manifest = open_manifest(manifest_file)
+    else:
+        old_manifest = Manifest()
+        log.debug("creating a new manifest file")
+    new_manifest = Manifest()  # use a different manifest for the output
+    for filename in filenames:
+        log.debug("adding %s" % filename)
+        path, name = os.path.split(filename)
+        new_fr = create_file_record(filename, algorithm)
+        new_fr.version = version
+        new_fr.visibility = visibility
+        new_fr.unpack = unpack
+        log.debug("appending a new file record to manifest file")
+        add = True
+        for fr in old_manifest.file_records:
+            log.debug("manifest file has '%s'" % "', ".join(
+                [x.filename for x in old_manifest.file_records]))
+            if new_fr == fr:
+                log.info("file already in old_manifest")
+                add = False
+            elif filename == fr.filename:
+                log.error("manifest already contains a different file named %s" % filename)
+                add = False
+        if add:
+            new_manifest.file_records.append(new_fr)
+            log.debug("added '%s' to manifest" % filename)
+        else:
+            all_files_added = False
+    # copy any files in the old manifest that aren't in the new one
+    new_filenames = set(fr.filename for fr in new_manifest.file_records)
+    for old_fr in old_manifest.file_records:
+        if old_fr.filename not in new_filenames:
+            new_manifest.file_records.append(old_fr)
+    with open(manifest_file, **open_attrs) as output:
+        new_manifest.dump(output, fmt='json')
+    return all_files_added
+
+
+def touch(f):
+    """Used to modify mtime in cached files;
+    mtime is used by the purge command"""
+    try:
+        os.utime(f, None)
+    except OSError:
+        log.warn('impossible to update utime of file %s' % f)
+
+
+def fetch_file(base_urls, file_record, grabchunk=1024 * 4, auth_file=None, region=None):
+    # A file which is requested to be fetched that exists locally will be
+    # overwritten by this function
+    fd, temp_path = tempfile.mkstemp(dir=os.getcwd())
+    os.close(fd)
+    fetched_path = None
+    for base_url in base_urls:
+        # Generate the URL for the file on the server side
+        url = urljoin(base_url,
+                      '%s/%s' % (file_record.algorithm, file_record.digest))
+        if region is not None:
+            url += '?region=' + region
+
+        log.info("Attempting to fetch from '%s'..." % base_url)
+
+        # Well, the file doesn't exist locally.  Let's fetch it.
+        try:
+            req = Request(url)
+            _authorize(req, auth_file)
+            f = urllib2.urlopen(req)
+            log.debug("opened %s for reading" % url)
+            with open(temp_path, **open_attrs) as out:
+                k = True
+                size = 0
+                while k:
+                    # TODO: print statistics as file transfers happen both for info and to stop
+                    # buildbot timeouts
+                    indata = f.read(grabchunk)
+                    if PY3:
+                        indata = to_text(indata)
+                    out.write(indata)
+                    size += len(indata)
+                    if len(indata) == 0:
+                        k = False
+                log.info("File %s fetched from %s as %s" %
+                         (file_record.filename, base_url, temp_path))
+                fetched_path = temp_path
+                break
+        except (URLError, HTTPError, ValueError):
+            log.info("...failed to fetch '%s' from %s" %
+                     (file_record.filename, base_url), exc_info=True)
+        except IOError:  # pragma: no cover
+            log.info("failed to write to temporary file for '%s'" %
+                     file_record.filename, exc_info=True)
+
+    # cleanup temp file in case of issues
+    if fetched_path:
+        return os.path.split(fetched_path)[1]
+    else:
+        try:
+            os.remove(temp_path)
+        except OSError:  # pragma: no cover
+            pass
+        return None
+
+
+def clean_path(dirname):
+    """Remove a subtree if is exists. Helper for unpack_file()."""
+    if os.path.exists(dirname):
+        log.info('rm tree: %s' % dirname)
+        shutil.rmtree(dirname)
+
+
+CHECKSUM_SUFFIX = ".checksum"
+
+
+def unpack_file(filename):
+    """Untar `filename`, assuming it is uncompressed or compressed with bzip2,
+    xz, gzip, or unzip a zip file. The file is assumed to contain a single
+    directory with a name matching the base of the given filename.
+    Xz support is handled by shelling out to 'tar'."""
+    if os.path.isfile(filename) and tarfile.is_tarfile(filename):
+        tar_file, zip_ext = os.path.splitext(filename)
+        base_file, tar_ext = os.path.splitext(tar_file)
+        clean_path(base_file)
+        log.info('untarring "%s"' % filename)
+        tar = tarfile.open(filename)
+        tar.extractall()
+        tar.close()
+    elif os.path.isfile(filename) and filename.endswith('.tar.xz'):
+        base_file = filename.replace('.tar.xz', '')
+        clean_path(base_file)
+        log.info('untarring "%s"' % filename)
+        # Not using tar -Jxf because it fails on Windows for some reason.
+        process = Popen(['xz', '-d', '-c', filename], stdout=PIPE)
+        stdout, stderr = process.communicate()
+        if process.returncode != 0:
+            return False
+        fileobj = BytesIO()
+        fileobj.write(stdout)
+        fileobj.seek(0)
+        tar = tarfile.open(fileobj=fileobj, mode='r|')
+        tar.extractall()
+        tar.close()
+    elif os.path.isfile(filename) and zipfile.is_zipfile(filename):
+        base_file = filename.replace('.zip', '')
+        clean_path(base_file)
+        log.info('unzipping "%s"' % filename)
+        z = zipfile.ZipFile(filename)
+        z.extractall()
+        z.close()
+    else:
+        log.error("Unknown archive extension for filename '%s'" % filename)
+        return False
+    return True
+
+
+def fetch_files(manifest_file, base_urls, filenames=[], cache_folder=None,
+                auth_file=None, region=None):
+    # Lets load the manifest file
+    try:
+        manifest = open_manifest(manifest_file)
+    except InvalidManifest as e:
+        log.error("failed to load manifest file at '%s': %s" % (
+            manifest_file,
+            str(e),
+        ))
+        return False
+
+    # we want to track files already in current working directory AND valid
+    # we will not need to fetch these
+    present_files = []
+
+    # We want to track files that fail to be fetched as well as
+    # files that are fetched
+    failed_files = []
+    fetched_files = []
+
+    # Files that we want to unpack.
+    unpack_files = []
+
+    # Lets go through the manifest and fetch the files that we want
+    for f in manifest.file_records:
+        # case 1: files are already present
+        if f.present():
+            if f.validate():
+                present_files.append(f.filename)
+                if f.unpack:
+                    unpack_files.append(f.filename)
+            else:
+                # we have an invalid file here, better to cleanup!
+                # this invalid file needs to be replaced with a good one
+                # from the local cash or fetched from a tooltool server
+                log.info("File %s is present locally but it is invalid, so I will remove it "
+                         "and try to fetch it" % f.filename)
+                os.remove(os.path.join(os.getcwd(), f.filename))
+
+        # check if file is already in cache
+        if cache_folder and f.filename not in present_files:
+            try:
+                shutil.copy(os.path.join(cache_folder, f.digest),
+                            os.path.join(os.getcwd(), f.filename))
+                log.info("File %s retrieved from local cache %s" %
+                         (f.filename, cache_folder))
+                touch(os.path.join(cache_folder, f.digest))
+
+                filerecord_for_validation = FileRecord(
+                    f.filename, f.size, f.digest, f.algorithm)
+                if filerecord_for_validation.validate():
+                    present_files.append(f.filename)
+                    if f.unpack:
+                        unpack_files.append(f.filename)
+                else:
+                    # the file copied from the cache is invalid, better to
+                    # clean up the cache version itself as well
+                    log.warn("File %s retrieved from cache is invalid! I am deleting it from the "
+                             "cache as well" % f.filename)
+                    os.remove(os.path.join(os.getcwd(), f.filename))
+                    os.remove(os.path.join(cache_folder, f.digest))
+            except IOError:
+                log.info("File %s not present in local cache folder %s" %
+                         (f.filename, cache_folder))
+
+        # now I will try to fetch all files which are not already present and
+        # valid, appending a suffix to avoid race conditions
+        temp_file_name = None
+        # 'filenames' is the list of filenames to be managed, if this variable
+        # is a non empty list it can be used to filter if filename is in
+        # present_files, it means that I have it already because it was already
+        # either in the working dir or in the cache
+        if (f.filename in filenames or len(filenames) == 0) and f.filename not in present_files:
+            log.debug("fetching %s" % f.filename)
+            temp_file_name = fetch_file(base_urls, f, auth_file=auth_file, region=region)
+            if temp_file_name:
+                fetched_files.append((f, temp_file_name))
+            else:
+                failed_files.append(f.filename)
+        else:
+            log.debug("skipping %s" % f.filename)
+
+    # lets ensure that fetched files match what the manifest specified
+    for localfile, temp_file_name in fetched_files:
+        # since I downloaded to a temp file, I need to perform all validations on the temp file
+        # this is why filerecord_for_validation is created
+
+        filerecord_for_validation = FileRecord(
+            temp_file_name, localfile.size, localfile.digest, localfile.algorithm)
+
+        if filerecord_for_validation.validate():
+            # great!
+            # I can rename the temp file
+            log.info("File integrity verified, renaming %s to %s" %
+                     (temp_file_name, localfile.filename))
+            os.rename(os.path.join(os.getcwd(), temp_file_name),
+                      os.path.join(os.getcwd(), localfile.filename))
+
+            if localfile.unpack:
+                unpack_files.append(localfile.filename)
+
+            # if I am using a cache and a new file has just been retrieved from a
+            # remote location, I need to update the cache as well
+            if cache_folder:
+                log.info("Updating local cache %s..." % cache_folder)
+                try:
+                    if not os.path.exists(cache_folder):
+                        log.info("Creating cache in %s..." % cache_folder)
+                        os.makedirs(cache_folder, 0o0700)
+                    shutil.copy(os.path.join(os.getcwd(), localfile.filename),
+                                os.path.join(cache_folder, localfile.digest))
+                    log.info("Local cache %s updated with %s" % (cache_folder,
+                                                                 localfile.filename))
+                    touch(os.path.join(cache_folder, localfile.digest))
+                except (OSError, IOError):
+                    log.warning('Impossible to add file %s to cache folder %s' %
+                                (localfile.filename, cache_folder), exc_info=True)
+        else:
+            failed_files.append(localfile.filename)
+            log.error("'%s'" % filerecord_for_validation.describe())
+            os.remove(temp_file_name)
+
+    # Unpack files that need to be unpacked.
+    for filename in unpack_files:
+        if not unpack_file(filename):
+            failed_files.append(filename)
+
+    # If we failed to fetch or validate a file, we need to fail
+    if len(failed_files) > 0:
+        log.error("The following files failed: '%s'" %
+                  "', ".join(failed_files))
+        return False
+    return True
+
+
+def freespace(p):
+    "Returns the number of bytes free under directory `p`"
+    if sys.platform == 'win32':  # pragma: no cover
+        # os.statvfs doesn't work on Windows
+        import win32file
+
+        secsPerClus, bytesPerSec, nFreeClus, totClus = win32file.GetDiskFreeSpace(
+            p)
+        return secsPerClus * bytesPerSec * nFreeClus
+    else:
+        r = os.statvfs(p)
+        return r.f_frsize * r.f_bavail
+
+
+def purge(folder, gigs):
+    """If gigs is non 0, it deletes files in `folder` until `gigs` GB are free,
+    starting from older files.  If gigs is 0, a full purge will be performed.
+    No recursive deletion of files in subfolder is performed."""
+
+    full_purge = bool(gigs == 0)
+    gigs *= 1024 * 1024 * 1024
+
+    if not full_purge and freespace(folder) >= gigs:
+        log.info("No need to cleanup")
+        return
+
+    files = []
+    for f in os.listdir(folder):
+        p = os.path.join(folder, f)
+        # it deletes files in folder without going into subfolders,
+        # assuming the cache has a flat structure
+        if not os.path.isfile(p):
+            continue
+        mtime = os.path.getmtime(p)
+        files.append((mtime, p))
+
+    # iterate files sorted by mtime
+    for _, f in sorted(files):
+        log.info("removing %s to free up space" % f)
+        try:
+            os.remove(f)
+        except OSError:
+            log.info("Impossible to remove %s" % f, exc_info=True)
+        if not full_purge and freespace(folder) >= gigs:
+            break
+
+
+def _log_api_error(e):
+    if hasattr(e, 'hdrs') and e.hdrs['content-type'] == 'application/json':
+        json_resp = json.load(e.fp)
+        log.error("%s: %s" % (json_resp['error']['name'],
+                              json_resp['error']['description']))
+    else:
+        log.exception("Error making RelengAPI request:")
+
+
+def _authorize(req, auth_file):
+    if not auth_file:
+        return
+
+    is_taskcluster_auth = False
+    with open(auth_file) as f:
+        auth_file_content = f.read().strip()
+        try:
+            auth_file_content = json.loads(auth_file_content)
+            is_taskcluster_auth = True
+        except Exception:
+            pass
+
+    if is_taskcluster_auth:
+        taskcluster_header = make_taskcluster_header(auth_file_content, req)
+        log.debug("Using taskcluster credentials in %s" % auth_file)
+        req.add_unredirected_header('Authorization', taskcluster_header)
+    else:
+        log.debug("Using Bearer token in %s" % auth_file)
+        req.add_unredirected_header('Authorization', 'Bearer %s' % auth_file_content)
+
+
+def _send_batch(base_url, auth_file, batch, region):
+    url = urljoin(base_url, 'upload')
+    if region is not None:
+        url += "?region=" + region
+    if PY3:
+        data = to_binary(json.dumps(batch))
+    else:
+        data = json.dumps(batch)
+    req = Request(url, data, {'Content-Type': 'application/json'})
+    _authorize(req, auth_file)
+    try:
+        resp = urllib2.urlopen(req)
+    except (URLError, HTTPError) as e:
+        _log_api_error(e)
+        return None
+    return json.load(resp)['result']
+
+
+def _s3_upload(filename, file):
+    # urllib2 does not support streaming, so we fall back to good old httplib
+    url = urlparse(file['put_url'])
+    cls = HTTPSConnection if url.scheme == 'https' else HTTPConnection
+    host, port = url.netloc.split(':') if ':' in url.netloc else (url.netloc, 443)
+    port = int(port)
+    conn = cls(host, port)
+    try:
+        req_path = "%s?%s" % (url.path, url.query) if url.query else url.path
+        with open(filename, 'rb') as f:
+            content = f.read()
+            content_length = len(content)
+            f.seek(0)
+            conn.request(
+                'PUT',
+                req_path,
+                f,
+                {
+                    'Content-Type': 'application/octet-stream',
+                    'Content-Length': str(content_length),
+                },
+            )
+            resp = conn.getresponse()
+            resp_body = resp.read()
+            conn.close()
+        if resp.status != 200:
+            raise RuntimeError("Non-200 return from AWS: %s %s\n%s" %
+                               (resp.status, resp.reason, resp_body))
+    except Exception:
+        file['upload_exception'] = sys.exc_info()
+        file['upload_ok'] = False
+    else:
+        file['upload_ok'] = True
+
+
+def _notify_upload_complete(base_url, auth_file, file):
+    req = Request(
+        urljoin(
+            base_url,
+            'upload/complete/%(algorithm)s/%(digest)s' % file))
+    _authorize(req, auth_file)
+    try:
+        urllib2.urlopen(req)
+    except HTTPError as e:
+        if e.code != 409:
+            _log_api_error(e)
+            return
+        # 409 indicates that the upload URL hasn't expired yet and we
+        # should retry after a delay
+        to_wait = int(e.headers.get('X-Retry-After', 60))
+        log.warning("Waiting %d seconds for upload URLs to expire" % to_wait)
+        time.sleep(to_wait)
+        _notify_upload_complete(base_url, auth_file, file)
+    except Exception:
+        log.exception("While notifying server of upload completion:")
+
+
+def upload(manifest, message, base_urls, auth_file, region):
+    try:
+        manifest = open_manifest(manifest)
+    except InvalidManifest:
+        log.exception("failed to load manifest file at '%s'")
+        return False
+
+    # verify the manifest, since we'll need the files present to upload
+    if not manifest.validate():
+        log.error('manifest is invalid')
+        return False
+
+    if any(fr.visibility is None for fr in manifest.file_records):
+        log.error('All files in a manifest for upload must have a visibility set')
+
+    # convert the manifest to an upload batch
+    batch = {
+        'message': message,
+        'files': {},
+    }
+    for fr in manifest.file_records:
+        batch['files'][fr.filename] = {
+            'size': fr.size,
+            'digest': fr.digest,
+            'algorithm': fr.algorithm,
+            'visibility': fr.visibility,
+        }
+
+    # make the upload request
+    resp = _send_batch(base_urls[0], auth_file, batch, region)
+    if not resp:
+        return None
+    files = resp['files']
+
+    # Upload the files, each in a thread.  This allows us to start all of the
+    # uploads before any of the URLs expire.
+    threads = {}
+    for filename, file in files.items():
+        if 'put_url' in file:
+            log.info("%s: starting upload" % (filename,))
+            thd = threading.Thread(target=_s3_upload,
+                                   args=(filename, file))
+            thd.daemon = 1
+            thd.start()
+            threads[filename] = thd
+        else:
+            log.info("%s: already exists on server" % (filename,))
+
+    # re-join all of those threads as they exit
+    success = True
+    while threads:
+        for filename, thread in list(threads.items()):
+            if not thread.is_alive():
+                # _s3_upload has annotated file with result information
+                file = files[filename]
+                thread.join()
+                if file['upload_ok']:
+                    log.info("%s: uploaded" % filename)
+                else:
+                    log.error("%s: failed" % filename,
+                              exc_info=file['upload_exception'])
+                    success = False
+                del threads[filename]
+
+    # notify the server that the uploads are completed.  If the notification
+    # fails, we don't consider that an error (the server will notice
+    # eventually)
+    for filename, file in files.items():
+        if 'put_url' in file and file['upload_ok']:
+            log.info("notifying server of upload completion for %s" % (filename,))
+            _notify_upload_complete(base_urls[0], auth_file, file)
+
+    return success
+
+
+def process_command(options, args):
+    """ I know how to take a list of program arguments and
+    start doing the right thing with them"""
+    cmd = args[0]
+    cmd_args = args[1:]
+    log.debug("processing '%s' command with args '%s'" %
+              (cmd, '", "'.join(cmd_args)))
+    log.debug("using options: %s" % options)
+
+    if cmd == 'list':
+        return list_manifest(options['manifest'])
+    if cmd == 'validate':
+        return validate_manifest(options['manifest'])
+    elif cmd == 'add':
+        return add_files(options['manifest'], options['algorithm'], cmd_args,
+                         options['version'], options['visibility'],
+                         options['unpack'])
+    elif cmd == 'purge':
+        if options['cache_folder']:
+            purge(folder=options['cache_folder'], gigs=options['size'])
+        else:
+            log.critical('please specify the cache folder to be purged')
+            return False
+    elif cmd == 'fetch':
+        return fetch_files(
+            options['manifest'],
+            options['base_url'],
+            cmd_args,
+            cache_folder=options['cache_folder'],
+            auth_file=options.get("auth_file"),
+            region=options.get('region'))
+    elif cmd == 'upload':
+        if not options.get('message'):
+            log.critical('upload command requires a message')
+            return False
+        return upload(
+            options.get('manifest'),
+            options.get('message'),
+            options.get('base_url'),
+            options.get('auth_file'),
+            options.get('region'))
+    else:
+        log.critical('command "%s" is not implemented' % cmd)
+        return False
+
+
+def main(argv, _skip_logging=False):
+    # Set up option parsing
+    parser = optparse.OptionParser()
+    parser.add_option('-q', '--quiet', default=logging.INFO,
+                      dest='loglevel', action='store_const', const=logging.ERROR)
+    parser.add_option('-v', '--verbose',
+                      dest='loglevel', action='store_const', const=logging.DEBUG)
+    parser.add_option('-m', '--manifest', default=DEFAULT_MANIFEST_NAME,
+                      dest='manifest', action='store',
+                      help='specify the manifest file to be operated on')
+    parser.add_option('-d', '--algorithm', default='sha512',
+                      dest='algorithm', action='store',
+                      help='hashing algorithm to use (only sha512 is allowed)')
+    parser.add_option('--visibility', default=None,
+                      dest='visibility', choices=['internal', 'public'],
+                      help='Visibility level of this file; "internal" is for '
+                           'files that cannot be distributed out of the company '
+                           'but not for secrets; "public" files are available to '
+                           'anyone without restriction')
+    parser.add_option('--unpack', default=False,
+                      dest='unpack', action='store_true',
+                      help='Request unpacking this file after fetch.'
+                           ' This is helpful with tarballs.')
+    parser.add_option('--version', default=None,
+                      dest='version', action='store',
+                      help='Version string for this file. This annotates the '
+                           'manifest entry with a version string to help '
+                           'identify the contents.')
+    parser.add_option('-o', '--overwrite', default=False,
+                      dest='overwrite', action='store_true',
+                      help='UNUSED; present for backward compatibility')
+    parser.add_option('--url', dest='base_url', action='append',
+                      help='RelengAPI URL ending with /tooltool/; default '
+                      'is appropriate for Mozilla')
+    parser.add_option('-c', '--cache-folder', dest='cache_folder',
+                      help='Local cache folder')
+    parser.add_option('-s', '--size',
+                      help='free space required (in GB)', dest='size',
+                      type='float', default=0.)
+    parser.add_option('-r', '--region', help='Preferred AWS region for upload or fetch; '
+                      'example: --region=us-west-2')
+    parser.add_option('--message',
+                      help='The "commit message" for an upload; format with a bug number '
+                           'and brief comment',
+                      dest='message')
+    parser.add_option('--authentication-file',
+                      help='Use the RelengAPI token found in the given file to '
+                           'authenticate to the RelengAPI server.',
+                      dest='auth_file')
+
+    (options_obj, args) = parser.parse_args(argv[1:])
+
+    # default the options list if not provided
+    if not options_obj.base_url:
+        options_obj.base_url = ['https://tooltool.mozilla-releng.net/']
+
+    # ensure all URLs have a trailing slash
+    def add_slash(url):
+        return url if url.endswith('/') else (url + '/')
+    options_obj.base_url = [add_slash(u) for u in options_obj.base_url]
+
+    # expand ~ in --authentication-file
+    if options_obj.auth_file:
+        options_obj.auth_file = os.path.expanduser(options_obj.auth_file)
+
+    # Dictionaries are easier to work with
+    options = vars(options_obj)
+
+    log.setLevel(options['loglevel'])
+
+    # Set up logging, for now just to the console
+    if not _skip_logging:  # pragma: no cover
+        ch = logging.StreamHandler()
+        cf = logging.Formatter("%(levelname)s - %(message)s")
+        ch.setFormatter(cf)
+        log.addHandler(ch)
+
+    if options['algorithm'] != 'sha512':
+        parser.error('only --algorithm sha512 is supported')
+
+    if len(args) < 1:
+        parser.error('You must specify a command')
+
+    return 0 if process_command(options, args) else 1
+
+
+if __name__ == "__main__":  # pragma: no cover
+    sys.exit(main(sys.argv))
diff --git a/tests/wpt/web-platform-tests/tools/wpt/android.py b/tests/wpt/web-platform-tests/tools/wpt/android.py
new file mode 100644
index 00000000000..f92146c75e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wpt/android.py
@@ -0,0 +1,176 @@
+import argparse
+import os
+import platform
+import shutil
+import subprocess
+
+import requests
+from mozrunner.devices import android_device
+
+android_device.TOOLTOOL_PATH = os.path.join(os.path.dirname(__file__),
+                                            os.pardir,
+                                            "third_party",
+                                            "tooltool",
+                                            "tooltool.py")
+
+here = os.path.abspath(os.path.dirname(__file__))
+wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
+
+
+def get_parser_install():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--reinstall", action="store_true", default=False,
+                        help="Force reinstall even if the emulator already exists")
+    return parser
+
+
+def get_parser_start():
+    return get_parser_install()
+
+
+def get_sdk_path(dest):
+    if dest is None:
+        # os.getcwd() doesn't include the venv path
+        dest = os.path.join(wpt_root, "_venv")
+    dest = os.path.join(dest, 'android-sdk')
+    return os.path.abspath(os.environ.get('ANDROID_SDK_PATH', dest))
+
+
+def uninstall_sdk(dest=None):
+    path = get_sdk_path(dest)
+    if os.path.exists(path) and os.path.isdir(path):
+        shutil.rmtree(path)
+
+
+def install_sdk(logger, dest=None):
+    sdk_path = get_sdk_path(dest)
+    if os.path.isdir(sdk_path):
+        logger.info("Using SDK installed at %s" % sdk_path)
+        return sdk_path, False
+
+    if not os.path.exists(sdk_path):
+        os.makedirs(sdk_path)
+
+    os_name = platform.system().lower()
+    if os_name not in ["darwin", "linux", "windows"]:
+        logger.error("Unsupported platform %s" % os_name)
+        raise NotImplementedError
+
+    os_name = 'darwin' if os_name == 'macosx' else os_name
+    # TODO: either always use the latest version or have some way to
+    # configure a per-product version if there are strong requirements
+    # to use a specific version.
+    url = 'https://dl.google.com/android/repository/sdk-tools-%s-4333796.zip' % (os_name,)
+
+    logger.info("Getting SDK from %s" % url)
+    temp_path = os.path.join(sdk_path, url.rsplit("/", 1)[1])
+    try:
+        with open(temp_path, "wb") as f:
+            with requests.get(url, stream=True) as resp:
+                shutil.copyfileobj(resp.raw, f)
+
+        # Python's zipfile module doesn't seem to work here
+        subprocess.check_call(["unzip", temp_path], cwd=sdk_path)
+    finally:
+        os.unlink(temp_path)
+
+    return sdk_path, True
+
+
+def install_android_packages(logger, sdk_path, no_prompt=False):
+    sdk_manager_path = os.path.join(sdk_path, "tools", "bin", "sdkmanager")
+    if not os.path.exists(sdk_manager_path):
+        raise OSError("Can't find sdkmanager at %s" % sdk_manager_path)
+
+    #TODO: Not sure what's really needed here
+    packages = ["platform-tools",
+                "build-tools;28.0.3",
+                "platforms;android-28",
+                "emulator"]
+
+    # TODO: make this work non-internactively
+    logger.info("Installing SDK packages")
+    cmd = [sdk_manager_path] + packages
+
+    proc = subprocess.Popen(cmd, stdin=subprocess.PIPE)
+    if no_prompt:
+        data = "Y\n" * 100 if no_prompt else None
+        proc.communicate(data)
+    else:
+        proc.wait()
+    if proc.returncode != 0:
+        raise subprocess.CalledProcessError(proc.returncode, cmd)
+
+
+def get_emulator(sdk_path):
+    if "ANDROID_SDK_ROOT" not in os.environ:
+        os.environ["ANDROID_SDK_ROOT"] = sdk_path
+    substs = {"top_srcdir": wpt_root, "TARGET_CPU": "x86"}
+    emulator = android_device.AndroidEmulator("*", substs=substs)
+    emulator.emulator_path = os.path.join(sdk_path, "emulator", "emulator")
+    emulator.avd_info.tooltool_manifest = os.path.join(wpt_root,
+                                                       "tools",
+                                                       "wpt",
+                                                       "mach-emulator.manifest")
+    return emulator
+
+
+def install(logger, reinstall=False, no_prompt=False):
+    if reinstall:
+        uninstall_sdk()
+
+    dest, new_install = install_sdk(logger)
+    if new_install:
+        install_android_packages(logger, dest, no_prompt)
+
+    if "ANDROID_SDK_ROOT" not in os.environ:
+        os.environ["ANDROID_SDK_ROOT"] = dest
+
+    emulator = get_emulator(dest)
+    emulator.update_avd()
+    return emulator
+
+
+def start(logger, emulator=None, reinstall=False):
+    if reinstall:
+        install(reinstall=True)
+
+    sdk_path = get_sdk_path(None)
+
+    if emulator is None:
+        emulator = get_emulator(sdk_path)
+
+    if not emulator.check_avd():
+        emulator.update_avd()
+
+    emulator.start()
+    emulator.wait_for_start()
+    return emulator
+
+
+def run_install(venv, **kwargs):
+    try:
+        import logging
+        logging.basicConfig()
+        logger = logging.getLogger()
+
+        install(logger, **kwargs)
+    except Exception:
+        import traceback
+        traceback.print_exc()
+        import pdb
+        pdb.post_mortem()
+
+
+def run_start(venv, **kwargs):
+    try:
+        import logging
+        logging.basicConfig()
+        logger = logging.getLogger()
+
+        start(logger, **kwargs)
+    except Exception:
+        import traceback
+        traceback.print_exc()
+        import pdb
+        pdb.post_mortem()
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index b905379c754..ca86c55d45f 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -285,15 +285,19 @@ class Firefox(Browser):
         return "%s/archive/%s.zip/testing/profiles/" % (repo, tag)
 
     def install_prefs(self, binary, dest=None, channel=None):
-        version, channel_ = self.get_version_and_channel(binary)
-        if channel is not None and channel != channel_:
-            # Beta doesn't always seem to have the b in the version string, so allow the
-            # manually supplied value to override the one from the binary
-            self.logger.warning("Supplied channel doesn't match binary, using supplied channel")
-        elif channel is None:
-            channel = channel_
+        if binary:
+            version, channel_ = self.get_version_and_channel(binary)
+            if channel is not None and channel != channel_:
+                # Beta doesn't always seem to have the b in the version string, so allow the
+                # manually supplied value to override the one from the binary
+                self.logger.warning("Supplied channel doesn't match binary, using supplied channel")
+            elif channel is None:
+                channel = channel_
+        else:
+            version = None
+
         if dest is None:
-            dest = os.pwd
+            dest = os.curdir
 
         dest = os.path.join(dest, "profiles", channel)
         if version:
@@ -416,7 +420,33 @@ class FirefoxAndroid(Browser):
     requirements = "requirements_firefox.txt"
 
     def install(self, dest=None, channel=None):
-        raise NotImplementedError
+        if dest is None:
+            dest = os.pwd
+
+        TC_QUEUE_BASE = "https://queue.taskcluster.net/v1/"
+        TC_INDEX_BASE = "https://index.taskcluster.net/v1/"
+
+
+        resp = requests.get(TC_INDEX_BASE +
+                            "task/gecko.v2.mozilla-central.latest.mobile.android-x86_64-opt")
+        resp.raise_for_status()
+        index = resp.json()
+        task_id = index["taskId"]
+
+        resp = requests.get(TC_QUEUE_BASE + "task/%s/artifacts/%s" %
+                            (task_id, "public/build/geckoview-androidTest.apk"))
+        resp.raise_for_status()
+
+        apk_path = os.path.join(dest, "geckoview-androidTest.apk")
+
+        with open(apk_path, "wb") as f:
+            f.write(resp.content)
+
+        return apk_path
+
+    def install_prefs(self, binary, dest=None, channel=None):
+        fx_browser = Firefox(self.logger)
+        return fx_browser.install_prefs(binary, dest, channel)
 
     def find_binary(self, venv_path=None, channel=None):
         raise NotImplementedError
diff --git a/tests/wpt/web-platform-tests/tools/wpt/commands.json b/tests/wpt/web-platform-tests/tools/wpt/commands.json
index da8804d0607..178eda9c265 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/commands.json
+++ b/tests/wpt/web-platform-tests/tools/wpt/commands.json
@@ -1,17 +1,86 @@
 {
-    "run": {"path": "run.py", "script": "run", "parser": "create_parser", "help": "Run tests in a browser",
-            "virtualenv": true, "install": ["requests", "zstandard"],
-            "requirements": ["../wptrunner/requirements.txt"]},
-    "create": {"path": "create.py", "script": "run", "parser": "get_parser", "help": "Create a new wpt test"},
-    "update-expectations": {"path": "update.py", "script": "update_expectations",
-                            "parser": "create_parser_update", "help": "Update expectations files from raw logs.",
-                            "virtualenv": true, "install": ["requests"],
-                            "requirements": ["../wptrunner/requirements.txt"]},
-    "files-changed": {"path": "testfiles.py", "script": "run_changed_files", "parser": "get_parser",
-                      "help": "Get a list of files that have changed", "virtualenv": false},
-    "tests-affected": {"path": "testfiles.py", "script": "run_tests_affected", "parser": "get_parser_affected",
-                       "help": "Get a list of tests affected by changes", "virtualenv": false},
-    "install": {"path": "install.py", "script": "run", "parser": "get_parser", "help": "Install browser components",
-                "install": ["mozdownload", "mozinstall"]},
-    "branch-point": {"path": "testfiles.py", "script": "display_branch_point", "parser": null, "help": "Print branch point from master", "virtualenv": false}
+  "run": {
+    "path": "run.py",
+    "script": "run",
+    "parser": "create_parser",
+    "help": "Run tests in a browser",
+    "virtualenv": true,
+    "install": [
+      "requests",
+      "zstandard"
+    ],
+    "requirements": [
+      "../wptrunner/requirements.txt"
+    ]
+  },
+  "create": {
+    "path": "create.py",
+    "script": "run",
+    "parser": "get_parser",
+    "help": "Create a new wpt test"
+  },
+  "update-expectations": {
+    "path": "update.py",
+    "script": "update_expectations",
+    "parser": "create_parser_update",
+    "help": "Update expectations files from raw logs.",
+    "virtualenv": true,
+    "install": [
+      "requests"
+    ],
+    "requirements": [
+      "../wptrunner/requirements.txt"
+    ]
+  },
+  "files-changed": {
+    "path": "testfiles.py",
+    "script": "run_changed_files",
+    "parser": "get_parser",
+    "help": "Get a list of files that have changed",
+    "virtualenv": false
+  },
+  "tests-affected": {
+    "path": "testfiles.py",
+    "script": "run_tests_affected",
+    "parser": "get_parser_affected",
+    "help": "Get a list of tests affected by changes",
+    "virtualenv": false
+  },
+  "install": {
+    "path": "install.py",
+    "script": "run",
+    "parser": "get_parser",
+    "help": "Install browser components",
+    "install": [
+      "mozdownload",
+      "mozinstall"
+    ]
+  },
+  "branch-point": {
+    "path": "testfiles.py",
+    "script": "display_branch_point",
+    "parser": null,
+    "help": "Print branch point from master",
+    "virtualenv": false
+  },
+  "install-android-emulator": {
+    "path": "android.py",
+    "script": "run_install",
+    "parser": "get_parser_install",
+    "help": "Setup the x86 android emulator",
+    "virtualenv": true,
+    "install": [
+      "requests"
+    ]
+  },
+  "start-android-emulator": {
+    "path": "android.py",
+    "script": "run_start",
+    "parser": "get_parser_start",
+    "help": "Start the x86 android emulator",
+    "virtualenv": true,
+    "install": [
+      "requests"
+    ]
+  }
 }
diff --git a/tests/wpt/web-platform-tests/tools/wpt/mach-emulator.manifest b/tests/wpt/web-platform-tests/tools/wpt/mach-emulator.manifest
new file mode 100644
index 00000000000..49f46c60ffe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wpt/mach-emulator.manifest
@@ -0,0 +1,10 @@
+[
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "AVDs-x86-android-7.0-build-2019-04-23.tar.gz",
+    "unpack": true,
+    "digest": "3cc03789aabfc692c76e5ae4ebefa7a5628f386df3c9778af2485a49b2401d4ad66301be6c3d116ff7d3ee747e00ce6332381216f55a7253b6b5b600d059baa2",
+    "size": 445250935
+  }
+]
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index 181d6bfdea9..0bccc687b7c 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -106,7 +106,7 @@ otherwise install OpenSSL and ensure that it's on your $PATH.""")
 
 
 def check_environ(product):
-    if product not in ("chrome", "firefox", "servo"):
+    if product not in ("chrome", "firefox", "firefox_android", "servo"):
         config_builder = serve.build_config(os.path.join(wpt_root, "config.json"))
         # Override the ports to avoid looking for free ports
         config_builder.ssl = {"type": "none"}
@@ -172,9 +172,9 @@ class BrowserSetup(object):
             elif resp == "n":
                 return False
 
-    def install(self, venv, channel=None):
+    def install(self, channel=None):
         if self.prompt_install(self.name):
-            return self.browser.install(venv.path, channel)
+            return self.browser.install(self.venv.path, channel)
 
     def install_requirements(self):
         if not self.venv.skip_virtualenv_setup:
@@ -255,8 +255,60 @@ class FirefoxAndroid(BrowserSetup):
     name = "firefox_android"
     browser_cls = browser.FirefoxAndroid
 
+    def install(self, channel):
+        # The install needs to happen in setup so that we have access to all the kwargs
+        self._install_browser = True
+        return None
+
     def setup_kwargs(self, kwargs):
-        pass
+        from . import android
+        import mozdevice
+
+        # We don't support multiple channels for android yet
+        if kwargs["browser_channel"] is None:
+            kwargs["browser_channel"] = "nightly"
+
+        if kwargs["prefs_root"] is None:
+            prefs_root = self.browser.install_prefs(kwargs["binary"],
+                                                    self.venv.path,
+                                                    channel=kwargs["browser_channel"])
+            kwargs["prefs_root"] = prefs_root
+
+        if kwargs["package_name"] is None:
+            kwargs["package_name"] = "org.mozilla.geckoview.test"
+        app = kwargs["package_name"]
+
+        if kwargs["device_serial"] is None:
+            kwargs["device_serial"] = "emulator-5554"
+
+        # We're running on an emulator so ensure that's set up
+        if kwargs["device_serial"].startswith("emulator-"):
+            emulator = android.install(logger, reinstall=False, no_prompt=not self.prompt)
+            android.start(logger, emulator=emulator, reinstall=False)
+
+        install = False
+        if hasattr(self, "_install_browser"):
+            if self.prompt_install("geckoview-test"):
+                install = True
+                apk_path = self.browser.install(self.venv.path,
+                                                channel=kwargs["browser_channel"])
+
+        if "ADB_PATH" not in os.environ:
+            adb_path = os.path.join(android.get_sdk_path(None),
+                                    "platform-tools",
+                                    "adb")
+            os.environ["ADB_PATH"] = adb_path
+        adb_path = os.environ["ADB_PATH"]
+
+        device = mozdevice.ADBDevice(adb=adb_path,
+                                     device=kwargs["device_serial"])
+
+        if install:
+            device.uninstall_app(app)
+            device.install_app(apk_path)
+        elif not device.is_app_installed(app):
+            raise WptrunError("app %s not installed on device %s" %
+                              (app, kwargs["device_serial"]))
 
 
 class Chrome(BrowserSetup):
@@ -425,7 +477,7 @@ class Edge(BrowserSetup):
     name = "edge"
     browser_cls = browser.Edge
 
-    def install(self, venv, channel=None):
+    def install(self, channel=None):
         raise NotImplementedError
 
     def setup_kwargs(self, kwargs):
@@ -451,7 +503,7 @@ class InternetExplorer(BrowserSetup):
     name = "ie"
     browser_cls = browser.InternetExplorer
 
-    def install(self, venv, channel=None):
+    def install(self, channel=None):
         raise NotImplementedError
 
     def setup_kwargs(self, kwargs):
@@ -472,7 +524,7 @@ class Safari(BrowserSetup):
     name = "safari"
     browser_cls = browser.Safari
 
-    def install(self, venv, channel=None):
+    def install(self, channel=None):
         raise NotImplementedError
 
     def setup_kwargs(self, kwargs):
@@ -489,7 +541,7 @@ class Sauce(BrowserSetup):
     name = "sauce"
     browser_cls = browser.Sauce
 
-    def install(self, venv, channel=None):
+    def install(self, channel=None):
         raise NotImplementedError
 
     def setup_kwargs(self, kwargs):
@@ -502,9 +554,9 @@ class Servo(BrowserSetup):
     name = "servo"
     browser_cls = browser.Servo
 
-    def install(self, venv, channel=None):
+    def install(self, channel=None):
         if self.prompt_install(self.name):
-            return self.browser.install(venv.path)
+            return self.browser.install(self.venv.path)
 
     def setup_kwargs(self, kwargs):
         if kwargs["binary"] is None:
@@ -524,7 +576,7 @@ class WebKit(BrowserSetup):
     name = "webkit"
     browser_cls = browser.WebKit
 
-    def install(self, venv, channel=None):
+    def install(self, channel=None):
         raise NotImplementedError
 
     def setup_kwargs(self, kwargs):
@@ -535,7 +587,7 @@ class Epiphany(BrowserSetup):
     name = "epiphany"
     browser_cls = browser.Epiphany
 
-    def install(self, venv, channel=None):
+    def install(self, channel=None):
         raise NotImplementedError
 
     def setup_kwargs(self, kwargs):
@@ -599,7 +651,7 @@ def setup_wptrunner(venv, prompt=True, install_browser=False, **kwargs):
     kwargs = utils.Kwargs(kwargs.iteritems())
 
     product_parts = kwargs["product"].split(":")
-    kwargs["product"] = product_parts[0]
+    kwargs["product"] = product_parts[0].replace("-", "_")
     sub_product = product_parts[1:]
 
     check_environ(kwargs["product"])
@@ -648,7 +700,7 @@ def setup_wptrunner(venv, prompt=True, install_browser=False, **kwargs):
 
     if install_browser:
         logger.info("Installing browser")
-        kwargs["binary"] = setup_cls.install(venv, channel=channel)
+        kwargs["binary"] = setup_cls.install(channel=channel)
 
     setup_cls.setup(kwargs)
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_run.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_run.py
index bc43e647c31..ef58ec41b2b 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tests/test_run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_run.py
@@ -60,6 +60,8 @@ def test_check_environ_fail(platform):
 
 @pytest.mark.parametrize("product", product_list)
 def test_setup_wptrunner(venv, logger, product):
+    if product == "firefox_android":
+        pytest.skip("Android emulator doesn't work on docker")
     parser = run.create_parser()
     kwargs = vars(parser.parse_args(["--channel=nightly", product]))
     kwargs["prompt"] = False
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
index 78e53e60d94..a0826aede8b 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
@@ -1,9 +1,11 @@
 marionette_driver==2.8.0
-mozprofile==2.3.0
-mozprocess==1.0.0
 mozcrash==1.1.0
-mozrunner==7.5.1
-mozleak==0.2
-mozinstall==2.0.0
 mozdownload==1.26.0
+mozinstall==2.0.0
+mozleak==0.2
+moznetwork==0.27
+mozprocess==1.0.0
+mozprofile==2.3.0
+mozrunner==7.5.1
 mozversion==2.1.0
+psutil==5.6.3
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptlogging.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptlogging.py
index 2070f77591d..6751f8907f4 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptlogging.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptlogging.py
@@ -1,7 +1,7 @@
 import logging
 
 from mozlog import commandline, stdadapter, set_default_logger
-from mozlog.structuredlog import StructuredLogger
+from mozlog.structuredlog import StructuredLogger, log_levels
 
 
 def setup(args, defaults):
@@ -46,3 +46,21 @@ class LogLevelRewriter(object):
             data = data.copy()
             data["level"] = self.to_level
         return self.inner(data)
+
+
+class LoggedAboveLevelHandler(object):
+    """Filter that records whether any log message above a certain level has been
+    seen.
+
+    :param min_level: Minimum level to record as a str (e.g., "CRITICAL")
+
+    """
+    def __init__(self, min_level):
+        self.min_level = log_levels[min_level.upper()]
+        self.has_log = False
+
+    def __call__(self, data):
+        if (data["action"] == "log" and
+            not self.has_log and
+            log_levels[data["level"]] <= self.min_level):
+            self.has_log = True
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index bbe9b56f675..6b4e70b3046 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -12,7 +12,7 @@ import testloader
 import wptcommandline
 import wptlogging
 import wpttest
-from mozlog import capture
+from mozlog import capture, handlers
 from font import FontInstaller
 from testrunner import ManagerGroup
 from browsers.base import NullBrowser
@@ -332,16 +332,25 @@ def check_stability(**kwargs):
 
 
 def start(**kwargs):
-    if kwargs["list_test_groups"]:
-        list_test_groups(**kwargs)
-    elif kwargs["list_disabled"]:
-        list_disabled(**kwargs)
-    elif kwargs["list_tests"]:
-        list_tests(**kwargs)
-    elif kwargs["verify"] or kwargs["stability"]:
-        return check_stability(**kwargs)
-    else:
-        return not run_tests(**kwargs)
+    assert logger is not None
+
+    logged_critical = wptlogging.LoggedAboveLevelHandler("CRITICAL")
+    handler = handlers.LogLevelFilter(logged_critical, "CRITICAL")
+    logger.add_handler(handler)
+
+    try:
+        if kwargs["list_test_groups"]:
+            list_test_groups(**kwargs)
+        elif kwargs["list_disabled"]:
+            list_disabled(**kwargs)
+        elif kwargs["list_tests"]:
+            list_tests(**kwargs)
+        elif kwargs["verify"] or kwargs["stability"]:
+            return check_stability(**kwargs) or logged_critical.has_log
+        else:
+            return not run_tests(**kwargs) or logged_critical.has_log
+    finally:
+        logger.remove_handler(handler)
 
 
 def main():
diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-createXXX.tentative.html b/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-createXXX.tentative.html
index 475a2647904..a078af4b36b 100644
--- a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-createXXX.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicy-createXXX.tentative.html
@@ -60,7 +60,7 @@
 
   const stringTestCases = [
     [ s => s, "whatever" ],
-    [ s => null, "null" ],
+    [ s => null, "" ],
     [ s => "well, " + s, "well, whatever" ],
     [ s => { throw new Error() }, new Error() ],
     [ s => { aGlobalVarForSideEffectTesting = s; return s }, "whatever" ],
@@ -71,7 +71,7 @@
 
   const urlTestCases = [
     [ s => s, INPUTS.SCRIPTURL ],
-    [ s => null, "null" ],
+    [ s => null, "" ],
     [ s => s + "#duck", INPUTS.SCRIPTURL + "#duck" ],
     [ s => { throw new Error() }, new Error() ],
     [ s => s + "#" + aGlobalVarForSideEffectTesting,
diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html b/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html
index 37e245ee27a..8cdc837cba8 100644
--- a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html
@@ -18,7 +18,7 @@
   }, "html = identity function");
 
   test(t => {
-    createHTMLTest('TestPolicyHTML2', { createHTML: s => null }, "null", t);
+    createHTMLTest('TestPolicyHTML2', { createHTML: s => null }, "", t);
   }, "html = null");
 
   var HTMLstr = 'well, ';
@@ -90,7 +90,7 @@
   }, "script = identity function");
 
   test(t => {
-    createScriptTest('TestPolicyScript2', { createScript: s => null }, "null", t);
+    createScriptTest('TestPolicyScript2', { createScript: s => null }, "", t);
   }, "script = null");
 
   var Scriptstr = 'well, ';
@@ -165,7 +165,7 @@
   }, "script_url = identity function");
 
   test(t => {
-    createScriptURLTest('TestPolicyScriptURL2', { createScriptURL: s => null }, "null", t);
+    createScriptURLTest('TestPolicyScriptURL2', { createScriptURL: s => null }, "", t);
   }, "script_url = null");
 
   var scriptURLstr = '#duck';
@@ -240,7 +240,7 @@
   }, "url = identity function");
 
   test(t => {
-    createURLTest('TestPolicyURL2', { createURL: s => null }, "null", t);
+    createURLTest('TestPolicyURL2', { createURL: s => null }, "", t);
   }, "url = null");
 
   var URLstr = '#x';
diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html b/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html
new file mode 100644
index 00000000000..aa13e4252c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="support/helper.sub.js"></script>
+</head>
+<body>
+<script>
+
+// We expect to run this test in two instances, enforcing and report-only
+// Trusted Type policies. We'll infer from our URL which one we are.
+//
+// The expected file names/headers are:
+// - default-policy.tentative.html:
+//     Content-Security-Policy: trusted-types *
+// - default-policy-report-only.tentative.html:
+//    Content-Security-Policy-Report-Only: trusted-types *
+//
+// The behaviour of the tests should be _mostly_ identical, except that
+// Trusted Types relevant assignments should only throw in the enforced
+// case. We will use assert_throws for things that should always throw
+// (i.e., regular exceptions), and maybe_throws for tests that should only
+// throw in TT-enforcing mode.
+const is_report_only = document.location.pathname.includes("report-only");
+const maybe_throws = (is_report_only
+  ? (error, fn, message) => fn()
+  : assert_throws);
+
+// Ensure that only the right events trigger violation reports.
+// The Promise will resolve, when an event including the string "done" is
+// received. The last line of this test file will cause this trigger.
+promise_test(t => {
+  let count = { "null": 0, "undefined": 0, "nodefault": 0 };
+  return new Promise((resolve, reject) => {
+    document.addEventListener("securitypolicyviolation", e => {
+      e.stopPropagation();
+      // We count the violation reports. We expect one each for "null" and
+      // "undefined", one each for the "no default" test case above, and one
+      // for the "done" line at the end, which signals the end of the test run.
+      if (e.sample.includes("done")) {
+        resolve(count);
+      } else if (e.sample.includes("null")) {
+        count["null"]++;
+      } else if (e.sample.includes("undefined")) {
+        count["undefined"]++;
+      } else if (e.sample.includes("nodefault")) {
+        count["nodefault"]++;
+      } else {
+        reject();
+      }
+    });
+  }).then(counters => {
+    for (const counter of ["null", "undefined", "nodefault"]) {
+      assert_equals(counters[counter], testCases.length,
+                    "event count of " + counter);
+    }
+  });
+}, "Count SecurityPolicyViolation events.");
+
+const testCases = [
+  [ "a", "href"],
+  [ "script", "src" ],
+  [ "div", "innerHTML" ],
+  [ "script", "text" ],
+];
+
+// Try each test case _without_ a default policy.
+testCases.forEach(c => {
+  test(t => {
+    const element = document.createElement(c[0]);
+    maybe_throws(TypeError(), _ => element[c[1]] = "nodefault");
+  }, `${c[0]}.${c[1]} no default policy`);
+});
+
+// A trusted type policy that forces a number of edge cases.
+function policy(str) {
+  if (str == "throw")
+    throw RangeError();
+  else if (str == "null")
+    return null;
+  else if (str == "undefined")
+    return undefined;
+  else if (str == "typeerror")
+    return document.bla();
+  else if (str == "done")
+    return null;
+  else
+    return "sanitized: " + str;
+}
+
+TrustedTypes.createPolicy("default", {
+  createURL: policy,
+  createScriptURL: policy,
+  createHTML: policy,
+  createScript: policy
+});
+
+testCases.forEach(c => {
+  const name = `${c[0]}.${c[1]} `;
+  test(t => {
+    const element = document.createElement(c[0]);
+    element[c[1]] = "abc";
+    assert_equals(element[c[1]], "sanitized: abc");
+  }, name + "default");
+  test(t => {
+    const element = document.createElement(c[0]);
+    maybe_throws(TypeError(), _ => element[c[1]] = "null");
+  }, name + "null");
+  test(t => {
+    const element = document.createElement(c[0]);
+    assert_throws(RangeError(), _ => element[c[1]] = "throw");
+  }, name + "throw");
+  test(t => {
+    const element = document.createElement(c[0]);
+    maybe_throws(TypeError(), _ => element[c[1]] = "undefined");
+  }, name + "undefined");
+  test(t => {
+    const element = document.createElement(c[0]);
+    assert_throws(TypeError(), _ => element[c[1]] = "typeerror");
+  }, name + "typeerror");
+});
+
+// Trigger the exit condition in the "Count" promise test above.
+try { document.createElement("a").href = "done"; } catch (e) {}
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html.headers b/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html.headers
new file mode 100644
index 00000000000..fa87952ae48
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy-Report-Only: trusted-types *
diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html b/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html
new file mode 100644
index 00000000000..aa13e4252c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="support/helper.sub.js"></script>
+</head>
+<body>
+<script>
+
+// We expect to run this test in two instances, enforcing and report-only
+// Trusted Type policies. We'll infer from our URL which one we are.
+//
+// The expected file names/headers are:
+// - default-policy.tentative.html:
+//     Content-Security-Policy: trusted-types *
+// - default-policy-report-only.tentative.html:
+//    Content-Security-Policy-Report-Only: trusted-types *
+//
+// The behaviour of the tests should be _mostly_ identical, except that
+// Trusted Types relevant assignments should only throw in the enforced
+// case. We will use assert_throws for things that should always throw
+// (i.e., regular exceptions), and maybe_throws for tests that should only
+// throw in TT-enforcing mode.
+const is_report_only = document.location.pathname.includes("report-only");
+const maybe_throws = (is_report_only
+  ? (error, fn, message) => fn()
+  : assert_throws);
+
+// Ensure that only the right events trigger violation reports.
+// The Promise will resolve, when an event including the string "done" is
+// received. The last line of this test file will cause this trigger.
+promise_test(t => {
+  let count = { "null": 0, "undefined": 0, "nodefault": 0 };
+  return new Promise((resolve, reject) => {
+    document.addEventListener("securitypolicyviolation", e => {
+      e.stopPropagation();
+      // We count the violation reports. We expect one each for "null" and
+      // "undefined", one each for the "no default" test case above, and one
+      // for the "done" line at the end, which signals the end of the test run.
+      if (e.sample.includes("done")) {
+        resolve(count);
+      } else if (e.sample.includes("null")) {
+        count["null"]++;
+      } else if (e.sample.includes("undefined")) {
+        count["undefined"]++;
+      } else if (e.sample.includes("nodefault")) {
+        count["nodefault"]++;
+      } else {
+        reject();
+      }
+    });
+  }).then(counters => {
+    for (const counter of ["null", "undefined", "nodefault"]) {
+      assert_equals(counters[counter], testCases.length,
+                    "event count of " + counter);
+    }
+  });
+}, "Count SecurityPolicyViolation events.");
+
+const testCases = [
+  [ "a", "href"],
+  [ "script", "src" ],
+  [ "div", "innerHTML" ],
+  [ "script", "text" ],
+];
+
+// Try each test case _without_ a default policy.
+testCases.forEach(c => {
+  test(t => {
+    const element = document.createElement(c[0]);
+    maybe_throws(TypeError(), _ => element[c[1]] = "nodefault");
+  }, `${c[0]}.${c[1]} no default policy`);
+});
+
+// A trusted type policy that forces a number of edge cases.
+function policy(str) {
+  if (str == "throw")
+    throw RangeError();
+  else if (str == "null")
+    return null;
+  else if (str == "undefined")
+    return undefined;
+  else if (str == "typeerror")
+    return document.bla();
+  else if (str == "done")
+    return null;
+  else
+    return "sanitized: " + str;
+}
+
+TrustedTypes.createPolicy("default", {
+  createURL: policy,
+  createScriptURL: policy,
+  createHTML: policy,
+  createScript: policy
+});
+
+testCases.forEach(c => {
+  const name = `${c[0]}.${c[1]} `;
+  test(t => {
+    const element = document.createElement(c[0]);
+    element[c[1]] = "abc";
+    assert_equals(element[c[1]], "sanitized: abc");
+  }, name + "default");
+  test(t => {
+    const element = document.createElement(c[0]);
+    maybe_throws(TypeError(), _ => element[c[1]] = "null");
+  }, name + "null");
+  test(t => {
+    const element = document.createElement(c[0]);
+    assert_throws(RangeError(), _ => element[c[1]] = "throw");
+  }, name + "throw");
+  test(t => {
+    const element = document.createElement(c[0]);
+    maybe_throws(TypeError(), _ => element[c[1]] = "undefined");
+  }, name + "undefined");
+  test(t => {
+    const element = document.createElement(c[0]);
+    assert_throws(TypeError(), _ => element[c[1]] = "typeerror");
+  }, name + "typeerror");
+});
+
+// Trigger the exit condition in the "Count" promise test above.
+try { document.createElement("a").href = "done"; } catch (e) {}
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html.headers b/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html.headers
new file mode 100644
index 00000000000..1bc33add09b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: trusted-types *
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
index 4d6ec956eac..9ce41a40321 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
@@ -12,12 +12,8 @@
   }, 'NDEFRecord constructor without init dict');
 
   test(() => {
-    const record = new NDEFRecord(null);
-    assert_equals(record.recordType.length, 0, 'empty recordType');
-    assert_equals(record.mediaType.length, 0, 'empty mediaType');
-    assert_equals(record.toText(), null, 'toText() returns null');
-    assert_equals(record.toArrayBuffer(), null, 'toArrayBuffer() returns null');
-    assert_equals(record.toJSON(), null, 'toJSON() returns null');
+    assert_throws(new TypeError, () => new NDEFRecord(null),
+        "The record has neither type nor data.");
   }, 'NDEFRecord constructor with null init dict');
 
   test(() => {
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCReader.https.html b/tests/wpt/web-platform-tests/web-nfc/NFCReader.https.html
index 6fcb9b161dd..448f2c74f5c 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCReader.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NFCReader.https.html
@@ -117,7 +117,7 @@ with '*' wildcard character in the beginning of path component followed by \
 subpath.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader({url: ""});
+  const reader = new NFCReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html b/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html
index 33471a18d8e..dcd23307a2e 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html
@@ -23,19 +23,15 @@ const invalid_type_messages =
       // NDEFRecord must have data.
       createMessage([createTextRecord()]),
 
-      // NDEFRecord.data for 'text' record must be number or string.
+      // NDEFRecord.data for 'text' record must be a string.
       createMessage([createTextRecord(test_buffer_data)]),
       createMessage([createTextRecord(test_json_data)]),
+      createMessage([createTextRecord(test_number_data)]),
 
       // https://w3c.github.io/web-nfc/#dfn-map-a-json-object-to-ndef
       // NDEFRecord must have data.
       createMessage([createJsonRecord()]),
 
-      // NDEFRecord.data for 'json' record must be object.
-      createMessage([createJsonRecord(test_buffer_data)]),
-      createMessage([createJsonRecord(test_number_data)]),
-      createMessage([createJsonRecord(test_text_data)]),
-
       // https://w3c.github.io/web-nfc/#dfn-map-a-url-to-ndef
       // NDEFRecord must have data.
       createMessage([createUrlRecord()]),
@@ -59,16 +55,16 @@ const invalid_syntax_messages =
     [
       // NDEFRecord.mediaType for 'text' record must be 'text/*'.
       createMessage([createRecord('text', 'application/json',
-          test_number_data)]),
+          test_text_data)]),
 
       // Data for 'url' record, must be a valid URL.
       createMessage([createUrlRecord('Invalid URL:// Data')]),
 
-      // NDEFRecord.mediaType for 'json' record must be 'application/json' or
-      // starts with 'application/' and ends with '+json'.
+      // A JSON MIME type is any MIME type whose subtype ends in "+json" or
+      // whose essence is "application/json" or "text/json".
       createMessage([createRecord('json', 'image/png', test_json_data)]),
       createMessage([createRecord('json', 'application/x+y', test_json_data)]),
-      createMessage([createRecord('json', 'custom/app+json', test_json_data)]),
+      createMessage([createRecord('json', 'custom/app+jsonx', test_json_data)]),
     ];
 
 const invalid_signals = [
@@ -195,8 +191,8 @@ promise_test(async t => {
   const writer = new NFCWriter();
   const message = createMessage([createRecord('json','application/json',
       { get x(){ return this; } })]);
-  await promise_rejects(t, 'SyntaxError', writer.push(message));
-}, "Reject promise with SyntaxError if 'json' record cannot be serialized.");
+  await promise_rejects(t, new TypeError(), writer.push(message));
+}, "Reject promise with exceptions thrown from serializing the 'json' record data.");
 
 promise_test(async t => {
   const writer = new NFCWriter();
@@ -251,8 +247,8 @@ nfc_test(async (t, mockNFC) => {
   const writer = new NFCWriter();
   let message = createMessage([createTextRecord(test_text_data),
                                createJsonRecord(test_json_data),
+                               createJsonRecord(test_number_data),
                                createOpaqueRecord(test_buffer_data),
-                               createTextRecord(test_number_data),
                                createUrlRecord(test_url_data)],
                                test_message_origin);
   await writer.push(message);
diff --git a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
index f7ee7a4786e..bffe10f8022 100644
--- a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
+++ b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
@@ -201,7 +201,7 @@ function testNFCScanOptions(message, scanOptions, unmatchedScanOptions, desc) {
 function testReadingMultiMessages(message, scanOptions, unmatchedMessage,
     unmatchedCompatibility, desc) {
   nfc_test(async (t, mockNFC) => {
-    const reader = new NFCReader(scanOptions);
+    const reader = new NFCReader();
     const controller = new AbortController();
     const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
diff --git a/tests/wpt/web-platform-tests/web-share/resources/manual-helper.js b/tests/wpt/web-platform-tests/web-share/resources/manual-helper.js
index e2ca229f4f9..15bb17936e4 100644
--- a/tests/wpt/web-platform-tests/web-share/resources/manual-helper.js
+++ b/tests/wpt/web-platform-tests/web-share/resources/manual-helper.js
@@ -86,7 +86,8 @@ function callWhenButtonClicked(click_handler) {
   return new Promise((resolve, reject) => {
     document.querySelector('#share_button').onclick = () => {
       try {
-        resolve(click_handler());
+        const result = click_handler();
+        resolve(result);
       } catch (e) {
         reject(e);
       }
diff --git a/tests/wpt/web-platform-tests/webxr/webxr-supported-by-feature-policy.html b/tests/wpt/web-platform-tests/webxr/webxr-supported-by-feature-policy.html
index 6d0531055c5..d1f8252977f 100644
--- a/tests/wpt/web-platform-tests/webxr/webxr-supported-by-feature-policy.html
+++ b/tests/wpt/web-platform-tests/webxr/webxr-supported-by-feature-policy.html
@@ -1,8 +1,5 @@
 <!DOCTYPE html>
 <title>Test that xr is advertised in the feature list</title>
-<!-- The Feature Policy feature name(s) for WebXR are still TBD. See the issue below. This test checks what is currently in the spec. -->
-<link rel="help" href="https://github.com/immersive-web/webxr/issues/308">
-<link rel="help" href="https://w3c.github.io/webappsec-feature-policy/#dom-featurepolicy-features">
 <link rel="help" href="https://immersive-web.github.io/webxr/#feature-policy">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/xhr/abort-after-stop.any.js b/tests/wpt/web-platform-tests/xhr/abort-after-stop.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/xhr/abort-after-stop.any.js
rename to tests/wpt/web-platform-tests/xhr/abort-after-stop.window.js