diff --git a/fetch/api/cors/cors-preflight-referrer.any.js b/fetch/api/cors/cors-preflight-referrer.any.js
index 6d69b328644a8aa..5df9fcf1429a7ae 100644
--- a/fetch/api/cors/cors-preflight-referrer.any.js
+++ b/fetch/api/cors/cors-preflight-referrer.any.js
@@ -35,8 +35,11 @@ var origin = get_host_info().HTTP_ORIGIN + "/";
 corsPreflightReferrer("Referrer policy: no-referrer", corsUrl, "no-referrer", undefined, "");
 corsPreflightReferrer("Referrer policy: no-referrer", corsUrl, "no-referrer", "myreferrer", "");
 
-corsPreflightReferrer("Referrer policy: \"\"", corsUrl, "", undefined, location.toString())
-corsPreflightReferrer("Referrer policy: \"\"", corsUrl, "", "myreferrer", new URL("myreferrer", location).toString());
+corsPreflightReferrer("Referrer policy: \"\"", corsUrl, "", undefined, origin);
+corsPreflightReferrer("Referrer policy: \"\"", corsUrl, "", "myreferrer", origin);
+
+corsPreflightReferrer("Referrer policy: no-referrer-when-downgrade", corsUrl, "no-referrer-when-downgrade", undefined, location.toString())
+corsPreflightReferrer("Referrer policy: no-referrer-when-downgrade", corsUrl, "no-referrer-when-downgrade", "myreferrer", new URL("myreferrer", location).toString());
 
 corsPreflightReferrer("Referrer policy: origin", corsUrl, "origin", undefined, origin);
 corsPreflightReferrer("Referrer policy: origin", corsUrl, "origin", "myreferrer", origin);
diff --git a/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html b/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html
index 0f8a633f1df345c..479019d847f4a81 100644
--- a/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html
+++ b/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html
@@ -6,12 +6,14 @@
 <div id=log></div>
 <iframe></iframe>
 <script>
-  setup({ single_test: true });
+  setup({
+    single_test: true
+  });
   onload = function() {
     var fr = document.querySelector("iframe")
     fr.src = "about:blank"
     fr.onload = function() {
-      assert_equals(fr.contentDocument.referrer, document.URL)
+      assert_equals(fr.contentDocument.referrer, document.location.origin + '/')
       done()
     }
   }
diff --git a/html/browsers/windows/browsing-context.html b/html/browsers/windows/browsing-context.html
index 430598fb21236c8..091ff8248098857 100644
--- a/html/browsers/windows/browsing-context.html
+++ b/html/browsers/windows/browsing-context.html
@@ -1,24 +1,26 @@
 <!doctype html>
 <html>
-  <head>
-    <title>HTML Test: Browsing context is first created</title>
-    <link rel="author" title="Intel" href="http://www.intel.com/" />
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
+
+<head>
+  <title>HTML Test: Browsing context is first created</title>
+  <link rel="author" title="Intel" href="http://www.intel.com/" />
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <div id="log"></div>
+  <script>
     var doc, iframe;
 
-    setup(function () {
+    setup(function() {
       // Create new browsing context via iframe
       iframe = document.createElement("iframe");
       document.body.appendChild(iframe);
       doc = iframe.contentDocument;
     });
 
-    test(function () {
+    test(function() {
       assert_equals(doc.compatMode, "BackCompat", "The compatMode of a document without a document type declaration should be 'BackCompat'."); // Quirksmode
       assert_equals(doc.contentType, "text/html", "The document should be an HTML document.");
       assert_equals(doc.readyState, "complete", "The readyState attribute should be 'complete'.");
@@ -29,7 +31,7 @@
       assert_equals(doc.characterSet, "UTF-8", "The document's encoding should be 'UTF-8'.");
     }, "Check that browsing context has new, ready HTML document");
 
-    test(function () {
+    test(function() {
       assert_equals(doc.childNodes.length, 1, "The document must have only one child.");
       assert_equals(doc.documentElement.tagName, "HTML");
       assert_equals(doc.documentElement.childNodes.length, 2, "The HTML element should have 2 children.");
@@ -39,10 +41,11 @@
       assert_false(doc.documentElement.childNodes[1].hasChildNodes(), "The BODY element should not have children.");
     }, "Check that new document nodes extant, empty");
 
-    test(function () {
-      assert_equals(doc.referrer, document.URL, "The document's referrer should be its creator document's address.");
+    test(function() {
+      assert_equals(doc.referrer, document.location.origin + '/', "The document's referrer should be its creator document's address's origin.");
       assert_equals(iframe.contentWindow.parent.document, document);
     }, "Check the document properties corresponding to the creator browsing context");
-    </script>
-  </body>
+  </script>
+</body>
+
 </html>
diff --git a/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html b/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html
index 2fa4e023893ce5b..1bd167bd337015e 100644
--- a/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html
+++ b/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html
@@ -9,49 +9,45 @@
 <script src="../resources/reporting-common.js"></script>
 
 <script>
+  let tests = [
+    // popup origin, popup COOP, popup COEP, popup COOP report only, popup COEP report only, expected reports
 
-let tests = [
-  // popup origin, popup COOP, popup COEP, popup COOP report only, popup COEP report only, expected reports
-
-  // Open a cross-origin popup with a same-origin COOP and no COEP. COOP
-  // switches the browsing context group and hence produces one report.
-  // This test verifies that the navigated to document properly sends a
-  // navigation-to report. The navigationURI is the referrer.
-  [
-    CROSS_ORIGIN,
-    `same-origin; report-to="${popupReportEndpoint.name}"`,
-    "",
-    "",
-    "",
+    // Open a cross-origin popup with a same-origin COOP and no COEP. COOP
+    // switches the browsing context group and hence produces one report.
+    // This test verifies that the navigated to document properly sends a
+    // navigation-to report. The navigationURI is the referrer.
     [
-      {
+      CROSS_ORIGIN,
+      `same-origin; report-to="${popupReportEndpoint.name}"`,
+      "",
+      "",
+      "",
+      [{
         "endpoint": popupReportEndpoint,
         "report": {
           "body": {
             "disposition": "enforce",
             "effectivePolicy": "same-origin",
             "previousResponseURL": "",
-            "referrer": `${location.href}`, // referrer
+            "referrer": `${location.origin}/`, // referrer
             "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
         }
-      }
-    ]
-  ],
-  // Open a same-origin popup with a unsafe-none COOP and no COEP. COOP switches
-  // the browsing context group and hence produces one report.
-  // This test verifies that having different policies on same origin documents
-  // still properly produces report to the navigated-to-document.
-  [
-    SAME_ORIGIN,
-    `unsafe-none; report-to="${popupReportEndpoint.name}"`,
-    "",
-    "",
-    "",
+      }]
+    ],
+    // Open a same-origin popup with a unsafe-none COOP and no COEP. COOP switches
+    // the browsing context group and hence produces one report.
+    // This test verifies that having different policies on same origin documents
+    // still properly produces report to the navigated-to-document.
     [
-      {
+      SAME_ORIGIN,
+      `unsafe-none; report-to="${popupReportEndpoint.name}"`,
+      "",
+      "",
+      "",
+      [{
         "endpoint": popupReportEndpoint,
         "report": {
           "body": {
@@ -64,47 +60,43 @@
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
         }
-      }
-    ]
-  ],
-  // Open a cross-origin popup with a unsafe-none COOP (with reporting) and no
-  // COEP. COOP switches the browsing context group and hence produces one
-  // reports to the unsafe-none document. This test verifies that unsafe-none
-  // properly sends report in that configuration.
-  [
-    CROSS_ORIGIN,
-    `unsafe-none; report-to="${popupReportEndpoint.name}"`,
-    "",
-    "",
-    "",
+      }]
+    ],
+    // Open a cross-origin popup with a unsafe-none COOP (with reporting) and no
+    // COEP. COOP switches the browsing context group and hence produces one
+    // reports to the unsafe-none document. This test verifies that unsafe-none
+    // properly sends report in that configuration.
     [
-      {
+      CROSS_ORIGIN,
+      `unsafe-none; report-to="${popupReportEndpoint.name}"`,
+      "",
+      "",
+      "",
+      [{
         "endpoint": popupReportEndpoint,
         "report": {
           "body": {
             "disposition": "enforce",
             "previousResponseURL": "",
-            "referrer": `${location.href}`, // referrer
+            "referrer": `${location.origin}/`, // referrer
             "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
         }
-      }
-    ]
-  ],
-  // Open a same-origin popup with a same-origin COOP Report only value, the
-  // report only matches the previous document COOP value, no report is sent.
-  [
-    SAME_ORIGIN,
-    "",
-    "",
-    `same-origin; report-to="${popupReportOnlyEndpoint.name}"`,
-    "",
-    []
-  ],
-];
-
-runNavigationReportingTests(document.title, tests);
+      }]
+    ],
+    // Open a same-origin popup with a same-origin COOP Report only value, the
+    // report only matches the previous document COOP value, no report is sent.
+    [
+      SAME_ORIGIN,
+      "",
+      "",
+      `same-origin; report-to="${popupReportOnlyEndpoint.name}"`,
+      "",
+      []
+    ],
+  ];
 
+  runNavigationReportingTests(document.title, tests);
 </script>
diff --git a/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html b/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html
index 05bb150d856eed9..c60b39ba125f98d 100644
--- a/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html
+++ b/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html
@@ -9,63 +9,60 @@
 <script src="../resources/reporting-common.js"></script>
 
 <script>
+  let tests = [
+    // popup origin, popup COOP, popup COEP, popup COOP report only, popup COEP report only, expected reports
 
-let tests = [
-  // popup origin, popup COOP, popup COEP, popup COOP report only, popup COEP report only, expected reports
-
-  // Open a same-origin popup with a same-origin COOP with reporting and no COEP.
-  // COOP switches the browsing context group and hence produces two reports
-  // (one from and one to). This test verifies that unsafe-none (from the opener)
-  // properly sends a report.
-  [
-    SAME_ORIGIN,
-    `same-origin; report-to="${popupReportEndpoint.name}"`,
-    "",
-    "",
-    "",
+    // Open a same-origin popup with a same-origin COOP with reporting and no COEP.
+    // COOP switches the browsing context group and hence produces two reports
+    // (one from and one to). This test verifies that unsafe-none (from the opener)
+    // properly sends a report.
     [
-      {
-        "endpoint": reportEndpoint,
-        "report": {
-          "body": {
-            "disposition": "enforce",
-            "effectivePolicy": "unsafe-none",
-            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
-            "type": "navigation-from-response"
-          },
-          "url": `${location.href}`,
-          "type": "coop"
+      SAME_ORIGIN,
+      `same-origin; report-to="${popupReportEndpoint.name}"`,
+      "",
+      "",
+      "",
+      [{
+          "endpoint": reportEndpoint,
+          "report": {
+            "body": {
+              "disposition": "enforce",
+              "effectivePolicy": "unsafe-none",
+              "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+              "type": "navigation-from-response"
+            },
+            "url": `${location.href}`,
+            "type": "coop"
+          }
+        },
+        {
+          "endpoint": popupReportEndpoint,
+          "report": {
+            "body": {
+              "disposition": "enforce",
+              "effectivePolicy": "same-origin",
+              "previousResponseURL": `${location.href}`, // previous document url
+              "referrer": `${location.href}`, // referrer
+              "type": "navigation-to-response"
+            },
+            "url": /uuid=EXECUTOR_UUID$/,
+            "type": "coop"
+          }
         }
-      },
-      {
-        "endpoint": popupReportEndpoint,
-        "report": {
-          "body": {
-            "disposition": "enforce",
-            "effectivePolicy": "same-origin",
-            "previousResponseURL": `${location.href}`, // previous document url
-            "referrer": `${location.href}`, // referrer
-            "type": "navigation-to-response"
-          },
-          "url": /uuid=EXECUTOR_UUID$/,
-          "type": "coop"
-        }
-      }
-    ]
-  ],
-  // Open a same-origin popup with a same-origin COOP (no reporting)and no COEP.
-  // COOP switches the browsing context group and hence produces one report for
-  // the navigated from document (this page, the opener). This test differs with
-  // the previous one as it assert that the navigated to document's COOP reporting
-  // values do not interfere.
-  [
-    SAME_ORIGIN,
-    `same-origin`,
-    "",
-    "",
-    "",
+      ]
+    ],
+    // Open a same-origin popup with a same-origin COOP (no reporting)and no COEP.
+    // COOP switches the browsing context group and hence produces one report for
+    // the navigated from document (this page, the opener). This test differs with
+    // the previous one as it assert that the navigated to document's COOP reporting
+    // values do not interfere.
     [
-      {
+      SAME_ORIGIN,
+      `same-origin`,
+      "",
+      "",
+      "",
+      [{
         "endpoint": reportEndpoint,
         "report": {
           "body": {
@@ -77,49 +74,46 @@
           "url": `${location.href}`,
           "type": "coop"
         }
-      }
-    ]
-  ],
-  // Open a cross-origin popup with a same-origin COOP and no COEP. COOP switches
-  // the browsing context group and hence produces two reports.
-  [
-    CROSS_ORIGIN,
-    `same-origin; report-to="${popupReportEndpoint.name}"`,
-    "",
-    "",
-    "",
+      }]
+    ],
+    // Open a cross-origin popup with a same-origin COOP and no COEP. COOP switches
+    // the browsing context group and hence produces two reports.
     [
-      {
-        "endpoint": reportEndpoint,
-        "report": {
-          "body": {
-            "disposition": "enforce",
-            "effectivePolicy": "unsafe-none",
-            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
-            "type": "navigation-from-response"
-          },
-          "url": `${location.href}`,
-          "type": "coop"
+      CROSS_ORIGIN,
+      `same-origin; report-to="${popupReportEndpoint.name}"`,
+      "",
+      "",
+      "",
+      [{
+          "endpoint": reportEndpoint,
+          "report": {
+            "body": {
+              "disposition": "enforce",
+              "effectivePolicy": "unsafe-none",
+              "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+              "type": "navigation-from-response"
+            },
+            "url": `${location.href}`,
+            "type": "coop"
+          }
+        },
+        {
+          "endpoint": popupReportEndpoint,
+          "report": {
+            "body": {
+              "disposition": "enforce",
+              "effectivePolicy": "same-origin",
+              "previousResponseURL": ``,
+              "referrer": `${location.origin}/`, // referrer
+              "type": "navigation-to-response"
+            },
+            "url": /uuid=EXECUTOR_UUID$/,
+            "type": "coop"
+          }
         }
-      },
-      {
-        "endpoint": popupReportEndpoint,
-        "report": {
-          "body": {
-            "disposition": "enforce",
-            "effectivePolicy": "same-origin",
-            "previousResponseURL": ``,
-            "referrer": `${location.href}`, // referrer
-            "type": "navigation-to-response"
-          },
-          "url": /uuid=EXECUTOR_UUID$/,
-          "type": "coop"
-        }
-      }
+      ]
     ]
-  ]
-];
-
-runNavigationReportingTests(document.title, tests);
+  ];
 
+  runNavigationReportingTests(document.title, tests);
 </script>
diff --git a/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html b/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html
index 2641813ea703dbf..5e2f9f552316905 100644
--- a/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html
+++ b/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html
@@ -14,26 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html b/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html
index 8f682e685a77264..74334b36ccfeb39 100644
--- a/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html
+++ b/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html b/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html
index 31111c3cce4a589..569b0ac8e2137e9 100644
--- a/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html
+++ b/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html b/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html
index 5985002bc775d96..e04c767ed5c1e78 100644
--- a/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html
+++ b/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html b/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html
index 4a62f71b44f7707..ca1042d6a6fcff4 100644
--- a/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html
+++ b/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html b/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html
index 95ef48cdbbdb7a5..7814f3492d4ff5a 100644
--- a/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html
+++ b/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html b/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html
index 2641813ea703dbf..5e2f9f552316905 100644
--- a/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html
+++ b/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html
@@ -14,26 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html b/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html
index 8f682e685a77264..74334b36ccfeb39 100644
--- a/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html
+++ b/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html b/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html
index 31111c3cce4a589..569b0ac8e2137e9 100644
--- a/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html
+++ b/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html b/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html
index 5985002bc775d96..e04c767ed5c1e78 100644
--- a/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html
+++ b/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html b/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html
index 4a62f71b44f7707..ca1042d6a6fcff4 100644
--- a/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html
+++ b/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html b/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html
index 95ef48cdbbdb7a5..7814f3492d4ff5a 100644
--- a/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html
+++ b/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html b/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html
index 19c55517e84867f..570a2505ddb5bf5 100644
--- a/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html
+++ b/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html
@@ -14,26 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html b/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html
index d0cb7206f8a6e4b..2b840d4aec5ac2f 100644
--- a/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html
+++ b/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html b/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html
index fbb87846a7a9564..cf605923b809de5 100644
--- a/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html
+++ b/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html b/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html
index 1433505d9aaacb4..111862a7dc50e1e 100644
--- a/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html
+++ b/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html b/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html
index 0e7bad7b16d3e61..abdb19514017e01 100644
--- a/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html
+++ b/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html b/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html
index 81df08c87e7e95f..b0bcb0a901b5617 100644
--- a/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html
+++ b/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html b/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html
index 19c55517e84867f..570a2505ddb5bf5 100644
--- a/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html
+++ b/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html
@@ -14,26 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html b/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html
index d0cb7206f8a6e4b..2b840d4aec5ac2f 100644
--- a/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html
+++ b/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html b/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html
index fbb87846a7a9564..cf605923b809de5 100644
--- a/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html
+++ b/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html b/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html
index 1433505d9aaacb4..111862a7dc50e1e 100644
--- a/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html
+++ b/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html b/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html
index 0e7bad7b16d3e61..abdb19514017e01 100644
--- a/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html
+++ b/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html b/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html
index 81df08c87e7e95f..b0bcb0a901b5617 100644
--- a/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html
+++ b/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html b/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html
index 55a4ab590eb62f4..14f57e9a2a826b5 100644
--- a/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html
+++ b/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html
@@ -14,26 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html b/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html
index f766c2d37f9ad29..f382044bad94790 100644
--- a/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html
+++ b/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html b/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html
index 213d16bf07c5ab6..45a6cbc98b0894e 100644
--- a/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html
+++ b/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html b/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html
index 2b3587e828bc2f0..00f7e69b577d819 100644
--- a/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html
+++ b/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html b/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html
index 888ef8183d852d0..c498ec68feb24eb 100644
--- a/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html
+++ b/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html b/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html
index 6b1681106a2a7ce..4bbf83cbe5e77dd 100644
--- a/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html
+++ b/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html b/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html
index 55a4ab590eb62f4..14f57e9a2a826b5 100644
--- a/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html
+++ b/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html
@@ -14,26 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.meta/unset/fetch.http.html b/referrer-policy/4K/gen/top.meta/unset/fetch.http.html
index f766c2d37f9ad29..f382044bad94790 100644
--- a/referrer-policy/4K/gen/top.meta/unset/fetch.http.html
+++ b/referrer-policy/4K/gen/top.meta/unset/fetch.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html b/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html
index 213d16bf07c5ab6..45a6cbc98b0894e 100644
--- a/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html
+++ b/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html b/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html
index 2b3587e828bc2f0..00f7e69b577d819 100644
--- a/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html
+++ b/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html b/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html
index 888ef8183d852d0..c498ec68feb24eb 100644
--- a/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html
+++ b/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/4K/gen/top.meta/unset/xhr.http.html b/referrer-policy/4K/gen/top.meta/unset/xhr.http.html
index 6b1681106a2a7ce..4bbf83cbe5e77dd 100644
--- a/referrer-policy/4K/gen/top.meta/unset/xhr.http.html
+++ b/referrer-policy/4K/gen/top.meta/unset/xhr.http.html
@@ -14,66 +14,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html b/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html
index e50b1f64a8a8eb8..6f6e8917755e149 100644
--- a/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html
+++ b/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html b/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html
index d87289b3931bae8..49fa13a10e9bff2 100644
--- a/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html
+++ b/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html b/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html
index 5f76c249747efbd..6c71bf7d15ad1e1 100644
--- a/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html
+++ b/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html b/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html
index 8c95386af49bdf0..8758daaac57084b 100644
--- a/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html
+++ b/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html b/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html
index cdfdb24d3587083..cd40ed11ce2e4b9 100644
--- a/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html
+++ b/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html b/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html
index beb2a4fc38b4b92..17bb7fdce02af16 100644
--- a/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html
+++ b/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.meta/unset/a-tag.http.html b/referrer-policy/gen/iframe.meta/unset/a-tag.http.html
index e50b1f64a8a8eb8..6f6e8917755e149 100644
--- a/referrer-policy/gen/iframe.meta/unset/a-tag.http.html
+++ b/referrer-policy/gen/iframe.meta/unset/a-tag.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.meta/unset/fetch.http.html b/referrer-policy/gen/iframe.meta/unset/fetch.http.html
index d87289b3931bae8..49fa13a10e9bff2 100644
--- a/referrer-policy/gen/iframe.meta/unset/fetch.http.html
+++ b/referrer-policy/gen/iframe.meta/unset/fetch.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html b/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html
index 5f76c249747efbd..6c71bf7d15ad1e1 100644
--- a/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html
+++ b/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.meta/unset/img-tag.http.html b/referrer-policy/gen/iframe.meta/unset/img-tag.http.html
index 8c95386af49bdf0..8758daaac57084b 100644
--- a/referrer-policy/gen/iframe.meta/unset/img-tag.http.html
+++ b/referrer-policy/gen/iframe.meta/unset/img-tag.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.meta/unset/script-tag.http.html b/referrer-policy/gen/iframe.meta/unset/script-tag.http.html
index cdfdb24d3587083..cd40ed11ce2e4b9 100644
--- a/referrer-policy/gen/iframe.meta/unset/script-tag.http.html
+++ b/referrer-policy/gen/iframe.meta/unset/script-tag.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/iframe.meta/unset/xhr.http.html b/referrer-policy/gen/iframe.meta/unset/xhr.http.html
index beb2a4fc38b4b92..17bb7fdce02af16 100644
--- a/referrer-policy/gen/iframe.meta/unset/xhr.http.html
+++ b/referrer-policy/gen/iframe.meta/unset/xhr.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html
index c00ba92de5c6e36..6ed5f3bb75a70f3 100644
--- a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html
index ed3bc61f01861c6..6ce6800ed1b9b11 100644
--- a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html
index a4fb7d8629b4714..6a0c5286868a995 100644
--- a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html
index 948089af7e88852..aed278716d11050 100644
--- a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html
index 5d152c996afe5a3..74212a61fb82e41 100644
--- a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html
index 20d3eb1ff827a4b..a54c8dec65e665c 100644
--- a/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html b/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html
index c00ba92de5c6e36..6ed5f3bb75a70f3 100644
--- a/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html b/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html
index ed3bc61f01861c6..6ce6800ed1b9b11 100644
--- a/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html b/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html
index a4fb7d8629b4714..6a0c5286868a995 100644
--- a/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html b/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html
index 948089af7e88852..aed278716d11050 100644
--- a/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html b/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html
index 5d152c996afe5a3..74212a61fb82e41 100644
--- a/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html b/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html
index 20d3eb1ff827a4b..a54c8dec65e665c 100644
--- a/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html
+++ b/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.http-rp/unset/a-tag.http.html b/referrer-policy/gen/top.http-rp/unset/a-tag.http.html
index 67702eb9257a75a..72e159c72e529aa 100644
--- a/referrer-policy/gen/top.http-rp/unset/a-tag.http.html
+++ b/referrer-policy/gen/top.http-rp/unset/a-tag.http.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.http-rp/unset/fetch.http.html b/referrer-policy/gen/top.http-rp/unset/fetch.http.html
index 5c2ed3836d14eb8..1dfb592eebbf2e8 100644
--- a/referrer-policy/gen/top.http-rp/unset/fetch.http.html
+++ b/referrer-policy/gen/top.http-rp/unset/fetch.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html b/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html
index 26d595fcc6b4311..557d6a532357dd1 100644
--- a/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html
+++ b/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.http-rp/unset/img-tag.http.html b/referrer-policy/gen/top.http-rp/unset/img-tag.http.html
index 0827ebde9c31f4e..3987df15184e3eb 100644
--- a/referrer-policy/gen/top.http-rp/unset/img-tag.http.html
+++ b/referrer-policy/gen/top.http-rp/unset/img-tag.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.http-rp/unset/script-tag.http.html b/referrer-policy/gen/top.http-rp/unset/script-tag.http.html
index c5cad6a0433af93..788c8d04f2b5d90 100644
--- a/referrer-policy/gen/top.http-rp/unset/script-tag.http.html
+++ b/referrer-policy/gen/top.http-rp/unset/script-tag.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.http-rp/unset/xhr.http.html b/referrer-policy/gen/top.http-rp/unset/xhr.http.html
index b3380b89ba34776..866577c3366b9f6 100644
--- a/referrer-policy/gen/top.http-rp/unset/xhr.http.html
+++ b/referrer-policy/gen/top.http-rp/unset/xhr.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.meta/unset/a-tag.http.html b/referrer-policy/gen/top.meta/unset/a-tag.http.html
index 67702eb9257a75a..72e159c72e529aa 100644
--- a/referrer-policy/gen/top.meta/unset/a-tag.http.html
+++ b/referrer-policy/gen/top.meta/unset/a-tag.http.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.meta/unset/fetch.http.html b/referrer-policy/gen/top.meta/unset/fetch.http.html
index 5c2ed3836d14eb8..1dfb592eebbf2e8 100644
--- a/referrer-policy/gen/top.meta/unset/fetch.http.html
+++ b/referrer-policy/gen/top.meta/unset/fetch.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.meta/unset/iframe-tag.http.html b/referrer-policy/gen/top.meta/unset/iframe-tag.http.html
index 26d595fcc6b4311..557d6a532357dd1 100644
--- a/referrer-policy/gen/top.meta/unset/iframe-tag.http.html
+++ b/referrer-policy/gen/top.meta/unset/iframe-tag.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.meta/unset/img-tag.http.html b/referrer-policy/gen/top.meta/unset/img-tag.http.html
index 0827ebde9c31f4e..3987df15184e3eb 100644
--- a/referrer-policy/gen/top.meta/unset/img-tag.http.html
+++ b/referrer-policy/gen/top.meta/unset/img-tag.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.meta/unset/script-tag.http.html b/referrer-policy/gen/top.meta/unset/script-tag.http.html
index c5cad6a0433af93..788c8d04f2b5d90 100644
--- a/referrer-policy/gen/top.meta/unset/script-tag.http.html
+++ b/referrer-policy/gen/top.meta/unset/script-tag.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/top.meta/unset/xhr.http.html b/referrer-policy/gen/top.meta/unset/xhr.http.html
index b3380b89ba34776..866577c3366b9f6 100644
--- a/referrer-policy/gen/top.meta/unset/xhr.http.html
+++ b/referrer-policy/gen/top.meta/unset/xhr.http.html
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html b/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html
index 3d3478ff9974c17..8b830569b84528e 100644
--- a/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html
+++ b/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html b/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html
index ff58f802a4f0037..2fc20e295e9189e 100644
--- a/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html
+++ b/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html b/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html
index 790fcc5963b1e7e..fbd245a4d89aec8 100644
--- a/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html
+++ b/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html b/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html
index da200bb87ae0e4a..1c72732b9250f3c 100644
--- a/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html
+++ b/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html b/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
index 670f78ab3ad0eba..b7f8dabc0cd4b68 100644
--- a/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
+++ b/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
@@ -4,13 +4,13 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/make-html-script.js"></script>
-<meta name="referrer" content="origin">
+<meta name="referrer" content="unsafe-url">
 <div id="log"></div>
 <script>
 [
   {
     srcDocPolicy: ``,
-    expected: self.origin + "/"
+    expected: location.origin + "/custom"
   },
   {
     srcDocPolicy: `<meta name="referrer" content="no-referrer">`,
@@ -45,7 +45,8 @@
 [
   {
     srcDocPolicy: ``,
-    expected: self.origin + "/"
+    expected: undefined  // Because the URL of <iframe src="javascript:..."> is about:blank,
+                         // the referrer should be no referrer.
   },
   {
     srcDocPolicy: `<meta name="referrer" content="no-referrer">`,
diff --git a/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html b/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html
index e8de690c9c395a2..cf1f099c63e22d2 100644
--- a/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html
+++ b/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/make-html-script.js"></script>
-<meta name="referrer" content="origin">
+<meta name="referrer" content="unsafe-url">
 <div id="log"></div>
 <script>
 
@@ -26,7 +26,7 @@
     // Document's origin == location.orgin. Furthermore, since the iframe
     // inherits its parent's referrer policy, the URL should be restricted to
     // its origin.
-    expected: self.origin + "/"
+    expected: self.origin + "/custom"
   }
 ].forEach(({ fetchReferrer, expected }) => {
   promise_test(t => {
diff --git a/referrer-policy/generic/multiple-headers-one-invalid.html b/referrer-policy/generic/multiple-headers-one-invalid.html
index 5561cd85009c8df..eca734601a61c26 100644
--- a/referrer-policy/generic/multiple-headers-one-invalid.html
+++ b/referrer-policy/generic/multiple-headers-one-invalid.html
@@ -16,9 +16,13 @@ <h1>Referrer Policy: multiple Referrer-Policy headers with one invalid</h1>
     <script>
       promise_test(() => {
         var urlPath = '/common/security-features/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                  urlPath;
-        return requestViaImage(url, null, 'no-referrer')
+        // The default referrer policy is strict-origin-when-cross-origin.
+        // This document's headers contain the 'origin' and 'no-referrer' tokens,
+        // and we're making a same-origin image load, so, if the image request,
+        // uses the default policy (which is what this test's verifying), we
+        // should see the full initiating URL in the referrer, rather than just
+        // the origin or an empty string.
+        return requestViaImage(urlPath, null, 'no-referrer')
           .then(function(message) {
               assert_equals(message.referrer, document.location.href);
             });
diff --git a/referrer-policy/generic/unsupported-csp-referrer-directive.html b/referrer-policy/generic/unsupported-csp-referrer-directive.html
index a7f22210edd9703..27a3a99113aecc3 100644
--- a/referrer-policy/generic/unsupported-csp-referrer-directive.html
+++ b/referrer-policy/generic/unsupported-csp-referrer-directive.html
@@ -17,9 +17,7 @@ <h1>Referrer Policy: CSP 'referrer' directive should not be supported</h1>
     <script>
       promise_test(function() {
         var urlPath = '/common/security-features/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                  urlPath;
-        return requestViaImage(url, null, 'always')
+        return requestViaImage(urlPath, null, 'always')
           .then(function(message) {
             assert_equals(message.referrer, document.location.href);
           });
diff --git a/referrer-policy/spec.src.json b/referrer-policy/spec.src.json
index 8d2a6d2e0b169e7..962ad4496a54d24 100644
--- a/referrer-policy/spec.src.json
+++ b/referrer-policy/spec.src.json
@@ -9,34 +9,55 @@
       "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies",
       "test_expansion": [
         {
-          // insecure-protocol
+          // same-insecure
           "expansion": "default",
           "source_scheme": "http",
           "source_context_list": "*",
           "delivery_type": "*",
-          "delivery_value": null,
+"delivery_value": null,
           "redirection": "*",
-          "origin": [
-            "same-http",
-            "cross-http"
-          ],
+          "origin": "same-http",
           "subresource": "*",
           "expectation": "stripped-referrer"
         },
+        {
+          // same-insecure
+          "expansion": "override",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "*",
+ "delivery_value": null,
+          "redirection": "swap-origin",
+          "origin": "same-http",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // cross-insecure
+          "expansion": "default",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "*",
+  "delivery_value": null,
+          "redirection": "*",
+          "origin": "cross-http",
+          "subresource": "*",
+          "expectation": "origin"
+        },
         {
           // upgrade-protocol
           "expansion": "default",
           "source_scheme": "http",
           "source_context_list": "*",
           "delivery_type": "*",
-          "delivery_value": null,
+   "delivery_value": null,
           "redirection": "*",
           "origin": [
             "same-https",
             "cross-https"
           ],
           "subresource": "*",
-          "expectation": "stripped-referrer"
+          "expectation": "origin"
         },
         {
           // downgrade-protocol
@@ -44,7 +65,7 @@
           "source_scheme": "https",
           "source_context_list": "*",
           "delivery_type": "*",
-          "delivery_value": null,
+    "delivery_value": null,
           "redirection": "*",
           "origin": [
             "same-http",
@@ -54,19 +75,40 @@
           "expectation": "omitted"
         },
         {
-          // secure-protocol
+          // same-secure
           "expansion": "default",
           "source_scheme": "https",
           "source_context_list": "*",
           "delivery_type": "*",
-          "delivery_value": null,
+"delivery_value": null,
           "redirection": "*",
-          "origin": [
-            "same-https",
-            "cross-https"
-          ],
+          "origin": "same-https",
           "subresource": "*",
           "expectation": "stripped-referrer"
+        },
+        {
+          // same-secure
+          "expansion": "override",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "*",
+"delivery_value": null,
+          "redirection": "swap-origin",
+          "origin": "same-https",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // cross-secure
+          "expansion": "default",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "*",
+ "delivery_value": null,
+          "redirection": "*",
+          "origin": "cross-https",
+          "subresource": "*",
+          "expectation": "origin"
         }
       ]
     },
diff --git a/service-workers/service-worker/fetch-event-referrer-policy.https.html b/service-workers/service-worker/fetch-event-referrer-policy.https.html
index 804fd9b4204c422..af4b20a9a4a7b76 100644
--- a/service-workers/service-worker/fetch-event-referrer-policy.https.html
+++ b/service-workers/service-worker/fetch-event-referrer-policy.https.html
@@ -22,7 +22,7 @@
           do_test(referrer,
             response_text,
             'Referrer: ' + href + '\n' +
-            'ReferrerPolicy: no-referrer-when-downgrade',
+            'ReferrerPolicy: strict-origin-when-cross-origin',
             'Service Worker should respond to fetch with the referrer URL when a member of RequestInit is present');
           var http_url = get_host_info()['HTTP_ORIGIN'] + base_path() +
                          '/resources/simple.html?referrerFull';
@@ -34,7 +34,7 @@
           do_test(referrer,
             response_text,
             'Referrer: \n' +
-            'ReferrerPolicy: no-referrer-when-downgrade',
+            'ReferrerPolicy: strict-origin-when-cross-origin',
             'Service Worker should respond to fetch with no referrer when a member of RequestInit is present with an HTTP request');
           return frame.contentWindow.fetch('resources/simple.html?referrerFull',
                                            {referrerPolicy: "", referrer: referrer});
@@ -44,7 +44,7 @@
           do_test(referrer,
             response_text,
             'Referrer: ' + href + '\n' +
-            'ReferrerPolicy: no-referrer-when-downgrade',
+            'ReferrerPolicy: strict-origin-when-cross-origin',
             'Service Worker should respond to fetch with the referrer with ""');
           var http_url = get_host_info()['HTTP_ORIGIN'] + base_path() +
                          '/resources/simple.html?referrerFull';
@@ -56,7 +56,7 @@
           do_test(referrer,
             response_text,
             'Referrer: \n' +
-            'ReferrerPolicy: no-referrer-when-downgrade',
+            'ReferrerPolicy: strict-origin-when-cross-origin',
             'Service Worker should respond to fetch with no referrer with ""');
           return frame.contentWindow.fetch('resources/simple.html?referrerFull',
                                            {referrerPolicy: "origin", referrer: referrer});
@@ -253,7 +253,7 @@
       .then(function(f) {
           frame = f;
           test(() => {
-            assert_equals(frame.contentDocument.body.textContent, 'ReferrerPolicy: no-referrer-when-downgrade');
+            assert_equals(frame.contentDocument.body.textContent, 'ReferrerPolicy: strict-origin-when-cross-origin');
           }, 'Service Worker should respond to fetch with the default referrer policy');
           // First, run the referrer policy tests without passing a referrer in RequestInit.
           return run_referrer_policy_tests(frame, undefined, frame.contentDocument.location.href,
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html
index 845b7e01ff28b92..420eaaaf260877a 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html
@@ -31,7 +31,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -51,7 +51,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html
index 476af828e636a75..bab50b7f885f083 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html
@@ -31,7 +31,7 @@
         // the report must not be downgraded.
         type: "sxg.cert_fetch_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -51,7 +51,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html
index d962b884e53c02f..99c5c7b910bd517 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html
@@ -33,7 +33,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -53,7 +53,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html
index 11dc4141b8a6f5f..0fd0c8c35d76e1c 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html
@@ -31,7 +31,7 @@
         // the report must not be downgraded.
         type: "sxg.cert_parse_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -51,7 +51,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html
index a1358e753000ecf..042f7d7094dec77 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html
@@ -32,7 +32,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -52,7 +52,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html
index 81520f9df987b0b..feb705d01012f6c 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html
@@ -28,7 +28,7 @@
         phase: "sxg",
         type: "sxg.cert_verification_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -48,7 +48,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html
index c0e06c8a197b3af..477eb55d6c7aae1 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html
@@ -31,7 +31,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -54,7 +54,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html
index aaad0c84b7b532a..9d8852cb10d9390 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html
@@ -29,7 +29,7 @@
         phase: "sxg",
         type: "sxg.invalid_integrity_header",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -49,7 +49,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html
index 33a42f9cbddd0eb..b31f3d0a34c9fc9 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html
@@ -36,7 +36,7 @@
         phase: "sxg",
         type: "sxg.mi_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -56,7 +56,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html
index ee9a50966d8f558..61c9bbdce6d7b27 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html
@@ -27,7 +27,7 @@
         phase: "sxg",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -47,7 +47,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html
index f835c6a96d20193..444d281378dda30 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html
@@ -35,7 +35,7 @@
         phase: "sxg",
         type: "sxg.parse_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           cert_url: []
@@ -53,7 +53,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html
index 87bbc369f2419ad..c92fc6c245d0565 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html
@@ -32,7 +32,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -52,7 +52,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html b/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html
index f57fd4d59670855..8c77317bd5960ed 100644
--- a/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html
@@ -28,7 +28,7 @@
         phase: "sxg",
         type: "sxg.signature_verification_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -48,7 +48,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html
index f663f35ce761f65..82b5d8f11ee0661 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html
@@ -29,7 +29,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -49,7 +49,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html
index c17fc5c02986789..32e3cad1b011365 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html
@@ -28,7 +28,7 @@
         // the report must not be downgraded.
         type: "sxg.cert_fetch_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -48,7 +48,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html
index f1a5eb17f6211f0..bbad6032e2ef821 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html
@@ -30,7 +30,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -50,7 +50,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html
index 00f41c0861c7aab..a6ea9e4eedf47fe 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html
@@ -28,7 +28,7 @@
         // the report must not be downgraded.
         type: "sxg.cert_parse_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -48,7 +48,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html
index 4836dc1b9466007..b25bf491da3cb46 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html
@@ -29,7 +29,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -49,7 +49,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html
index 441a17af1052019..f31a4c49d4fd372 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html
@@ -25,7 +25,7 @@
         phase: "sxg",
         type: "sxg.cert_verification_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -45,7 +45,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html
index b0f7103053ba8e8..faa02bc0eba5e48 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html
@@ -29,7 +29,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -52,7 +52,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html
index 1fd431c1a0b056e..990b4a387e43ca9 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html
@@ -26,7 +26,7 @@
         phase: "sxg",
         type: "sxg.invalid_integrity_header",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -46,7 +46,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html
index 2bbf0e8f2582f1d..f265a9205872b6c 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html
@@ -26,7 +26,7 @@
         phase: "sxg",
         type: "sxg.mi_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -46,7 +46,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html
index fb5fb58c9f7063c..e3c6a0eeead55a9 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html
@@ -24,7 +24,7 @@
         phase: "sxg",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -44,7 +44,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html
index 171baf1b4a93d7e..2e2b860e22f7ffd 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html
@@ -24,7 +24,7 @@
         phase: "sxg",
         type: "sxg.parse_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           cert_url: []
@@ -42,7 +42,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html
index 7340b75e35eb439..fbeaeecff94093e 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html
@@ -29,7 +29,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -49,7 +49,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html b/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html
index d552c4a8c339777..f3805ad69325061 100644
--- a/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html
+++ b/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html
@@ -25,7 +25,7 @@
         phase: "sxg",
         type: "sxg.signature_verification_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -45,7 +45,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html b/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
index 8a26b210a094104..26e63b9a4a51950 100644
--- a/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
+++ b/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
@@ -41,7 +41,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff --git a/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html b/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html
index d33324eaf12a23c..67de083d27a583e 100644
--- a/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html
+++ b/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html
@@ -16,7 +16,7 @@
       origin: REMOTE_ORIGIN,
       sxg: REMOTE_ORIGIN_SXG,
       referrerPolicy: undefined,
-      expectedReferrer: document.location.href
+      expectedReferrer: document.location.origin + '/'
     },
     {
       origin: REMOTE_ORIGIN,
diff --git a/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html b/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html
index b3c77d14273f2cc..4d8aff808127a1d 100644
--- a/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html
+++ b/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html
@@ -15,7 +15,7 @@
       origin: REMOTE_ORIGIN,
       sxg: SAME_ORIGIN_SXG,
       referrerPolicy: undefined,
-      expectedReferrer: document.location.href
+      expectedReferrer: document.location.origin + '/'
     },
     {
       origin: REMOTE_ORIGIN,
diff --git a/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html b/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html
index 8a6cdd993af3aa0..fc6f187be38db9b 100644
--- a/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html
+++ b/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html
@@ -15,7 +15,7 @@
       origin: SAME_ORIGIN,
       sxg: REMOTE_ORIGIN_SXG,
       referrerPolicy: undefined,
-      expectedReferrer: document.location.href
+      expectedReferrer: document.location.origin + '/'
     },
     {
       origin: SAME_ORIGIN,
